Fix tests after subtyping optimisations.