Improve spec testing