Cleanup tests and remove the hard coded override in the pom