refactoring cucumber test code
added two new rules, tests need to be refactored
stashing this in master to a feature branch, need to refactor the domain
goddammit i forgot to switch to the branch