Fixing unit tests to work with 'mvn test'