Strip out almost all non-tree hashing stuff in test file