operate structure changed
update TestCase and some var rename