Change tests structure