Adding more spec coverage