add cityhash
 change testutil to test_util