fixes to the crop and tests