Fix scala compiler warning
Update canonical test outputs

Commit 686ecc790e8e6f5e290ffeffea2e5b6aae173663 failed to do so.
Fixed variable-length hashes for jackhammer dump files
Merge branch 'master' into new_new_tester
Updating internal tests to reflect new tester behavior.