update test suite so that it passes
update rspec syntax to remove deprecation warnings