Move htest/ files under the test/ tree