Yeah, the tests would need a slight refactor to explicitly generate a hook token or not. Probably worth it though.