hwtests: cleanup