Removed some debug stuff, better description of a test
Produces cleaner external call instrumentation