Testsets refactoring cntd