some changes to tests and _hs_wca to find bugs