Working callbacks, broken tests