Fix tests when running mvn tests