More instrumentation and test cases