core-tests refactoring