Refactoring of test draft