Cleaned up spec helper