WIP on standardize callbacks.
Updated to use standardize callback params.
Fix tests with new callback format
Merge pull request #35 from hybridgroup/standardize-callbacks

Standardize callbacks