switch to HTF tests
fix hlint stuff