Added instrumenting tests