Changes to rspec tests

This is just an initial push still getting errors with
the tests.