Minor tests refactor