Tweak to comment in example
Callback test re-write
Finished refactor