Reorganizing the hash tree test case