Merge "allow 'main' as valid name for find_test_caller"