Small tests refactor