Renamed remaining test classes to *Spec