Some test cleanpups to align with the spec.