anchor.diff:      helper.TestIncrementalCompiler compiler =
           new helper.TestIncrementalCompiler(options, testUri);
   
  -    return new TestCompiler._(testUri, fs, formattedErrors, formattedWarnings,
  -        formattedErrorsCodes, formattedWarningsCodes, compiler);
  +    return new CompilerAndOptions(
  +        new TestCompiler._(testUri, fs, formattedErrors, formattedWarnings,
  +            formattedErrorsCodes, formattedWarningsCodes, compiler),
  +        options);
     }
   }
   
  
positive.code:     return sb.toString();
    }
  
    static Future<TestCompiler> initialize() async {
      final Uri base = Uri.parse("org-dartlang-test:///");
      final Uri sdkSummary = base.resolve("vm_platform_strong.dill");
      final Uri sdkRoot = computePlatformBinariesLocation(forceBuildDir: true);
      Uri platformUri = sdkRoot.resolve("vm_platform_strong.dill");
      final List<int> sdkSummaryData =
          await new File.fromUri(platformUri).readAsBytes();
      MemoryFileSystem fs = new MemoryFileSystem(base);
      fs.entityForUri(sdkSummary).writeAsBytesSync(sdkSummaryData);
  
  
negative.code: import 'incremental_suite.dart' as helper;
  
  main() async {
    CompilerAndOptions compilerAndOptions = TestCompiler.initialize();
    TestCompiler compiler = compilerAndOptions.compiler;
    bool hasNewline = true;
    int numErrors = 0;
    List<String> errorSource = [];
  