Simplfied many test redundancies and improved factories.rb