Fix a broken test
Handle an alternative callback function for certain actions