Adds more fixes from switching to rspec