changed entire structure of testing file

latest