Cleanup rspec and fix old way of doing tests