Fixed rspec stability issues, but it's slow to run now