Cleaned up test_helper some more