Clean up the callback test a bit