Cleanup instrumented-handler tests
Merge pull request #202 from RackerWilliams/instrumented_handler_test

Cleanup instrumented-handler tests