tests refactoring WIP