found issue with str and farm object
Merging testdata changes
Merge branch 'Josh'