refactored step defs and added more transformations
Merge branch 'master' of https://github.com/PhilipJordan/SOLID