Renamed tests to the standard required to be ran by maven (class name must end in Test)