Fixed some things... had issues with rspec