Minor test streamlining