Added more tests, updated env/step definitions