Add more default parameters to callback and update tests