added callbacks, accordingly fixed up tests