Renamed Test classes so that they would be picked up by the surefire plugin