restructed the test plan