Alex tests refactors