implement all hsherr, bring back another handful of tests