Add stubs and change structure of test plan