Refactoring + added test-resources mojo