Added back in more instrumented tests