Little tests refactoring;