cleaned up rspec
Rspec tests all cleaned up