Merge "Fix import group ordering in test_utils.py"