Yi - modify the structure of test