streamlining the tests