removed redundant and fixed broken rspec tests
Merge branch 'testing'