Improve spec assertions