test_helper improved
merge conflict resolved for test_helper