Minor tests refactor.