More test tweaks to resolve problems when the code changes propigate.