updated tests and hash/query splitting code.