Improved callback tests
Merge pull request #279 from GrahamCampbell/callback-tests

Improved The Callback Tests