Renamed unit tests so maven can see them (*Test)