Still need to fix some callbacks tests