Fix for hash and several tests