Testset refactoring cntd