Improve spec coverage