pom.xml fix
refactoring
refactoring and bugfixing, now all stories run