Clean ups, and fixing all tests. More importantly, HashQuery now directly stores its data in the key to array format