Very nearly finish with the callbackified tests.

This whole thing has been mindbending. Was it worth it???