Improve spec speed