Clean up tests and use spec reporter