Fix scala compiler warning
Update canonical test outputs

Commit 686ecc790e8e6f5e290ffeffea2e5b6aae173663 failed to do so.