diff --git a/src/crop/aquacrop.jl b/src/crop/aquacrop.jl
index 819ae6ac717d0ac71669db83a1a634f3eac30292..9452ce1ef88151534dc0d455d799c092c7b987ec 100644
--- a/src/crop/aquacrop.jl
+++ b/src/crop/aquacrop.jl
@@ -27,9 +27,9 @@ end
 
 croptype(cs::AquaCropState) = cs.croptype
 cropname(cs::AquaCropState) = cropname(croptype(cs))
-cropheight(cs::AquaCropState) = cs.height
-cropcover(cs::AquaCropState) = 0.0  # TODO: implement
-cropyield(cs::AquaCropState) = 0.0  # TODO: implement, units?
+cropheight(cs::AquaCropState) = cs.height  # TODO: use AquaCrop state info
+cropcover(cs::AquaCropState) = AquaCrop.canopycover(cs.cropstate)
+cropyield(cs::AquaCropState) = AquaCrop.dryyield(cs.cropstate)  # TODO: there is also freshyield
 isharvestable(cs::AquaCropState) = true  # TODO: implement this correctly
 
 """
diff --git a/test/crop_tests.jl b/test/crop_tests.jl
index 59ffdb6b86974cf206d2e18e80a5f0f61b441d42..aaf8f71da951922b8dc4cd2cbe4703175899d524 100644
--- a/test/crop_tests.jl
+++ b/test/crop_tests.jl
@@ -65,6 +65,6 @@ end
     @test cropname(fp) isa String
     @test cropheight(fp) isa Length{Float64}
     @test cropcover(fp) isa Float64
-    @test cropyield(fp) isa Float64
+    @test cropyield(fp) isa type(1.0u"kg/ha")
     # TODO: test stepagent!(), sow!(), harvest!()
 end