F2 tests correction, P6, P7 tasks, modules, design enhancing