Fixed test suite failure when running mvn test