cleaned up spec tests slightly