Chnaged structure of testsource