Cleans up spec
Moves tests to specs