o Add missing places for new codes hashing.
o Add test for legacy file reading/matching.