Small tests refactoring