Some tests refactors