Found solution that makes at least the current tests green.