add --dump for debugging
move instrumentation tests into their own file
use dump for the instrumentation tests
handle stupid formatting