Switch to rspec
Improve code coverage