Fix test_helper to work with 4.1