Adjusted tests to work with maven