Merge "Remove module_test_utils completely"