refactor hal tests :poop: