tests refactoring (wip)