further refactoring and moved to use_transactional_fixtures in rspec-rails