Improve rspec format and speed