Take advantage of fake_hook() in existing tests