refactoring of rspec suite