Fix problematic merge

fast_spec_helper.rb was moved which caused a subsequent merge to fail.