Migrate to JBehave
Cleanup, refactoring