Merge pull request #47 from csmith/master

Tidy up callbacks some more.
Add tests for process001