Refactored instrumentation tests.
Added test cases for type and method abstractions.