Added some more spec tests