Checked old rspec files and added a few tests
Merge branch 'integration_testing'