Change options for instrumenter and reporters + more tests