Clean up spec tests and simplify existing tests