Little tests refactoring