fix tests and hash bug from merge