Get rid ofthe outdated hs unit tests
fix up tests