Fix test warnings left in by 11343b34