Fixing unit tests, OrphanHALNavigator being shoehorned in