Added a Cucumber test and rerranged a little to make everything run in both idea and with gradle.