Minor tests refactoring.
More tests refactoring.