package com.uber.okbuck.core.model.jvm;

import java.util.List;
import java.util.Map;
import java.util.TreeMap;

public final class TestOptions {

  private final List<String> jvmArgs;
  private final TreeMap<String, Object> env;

  public TestOptions(List<String> jvmArgs, Map<String, Object> env) {
    this.jvmArgs = jvmArgs;
    this.env = new TreeMap<>(env);
  }

  public List<String> getJvmArgs() {
    return jvmArgs;
  }

  public TreeMap<String, Object> getEnv() {
    return env;
  }
}

@@ -433,20 +433,16 @@
  public 
-Tree
 Map%3CStri

Use Map in getter instead of TreeMap