hs-test: improve test infra