hs-test: clean-up obsolete code