Fix hoek quirks on engines
Fix tests