hash table fixes, test cleanup