Refactored tests, added surefire plugin to pom.