Minor refactorings
move resources for the tests to correct maven folder structure
fixes paths to the test resources