Some small tweaks to ensure backwards compat with legacy tests