Add MojoTest and align instrumentation test method with upstream