* moved TestEnviornment out of 'steps/support' to fix cannot find constructor issue
test3
* conclude merge after resolving conflict
* updating the cheese.feature after resolving conflict