Fix a bug
Add a basic dynamic instrument test, more to come