converted code to 2 param callbacks tests running