Cleaning up tests, small callback refactors.