Fix test case naming to preserve test case ordering based on yaml file