revert these test fixups to more default behavior