Update tests to be 5.3 compatible

This change also has the additional benefit of always asserting whether
the callback actually gets called or not.