restructing of tests