continue tests refactoring