Test fixups.