Add farm test that forces Null Object
Merge remote-tracking branch 'origin/farm_test2'

Update farm_test