Refactoring test code, bugfix in factory, updates to pom finalName