more refactor, resolved issue with duplicated execution of some tests