Switch to use RSpec

- Cleans up a bit of the test code.