fix merge conflict in test_helper
fix merge conflict in test_helper

srt32/fourthmeal,srt32/controller_refactoring,srt32/controller_refactoring,srt32/fourthmeal,bwinterling/fourthmeal,bwinterling/fourthmeal