Do some cleanup and require rspec.