add flag to temporarily disable consistency checking until hashing is implemented, and rm redundant tests