Some cleanup and fix rspec runner