Use test_helper instead of common now