modify code organization of testing