More tests refactoring.