fix: factor out test_utils, clean-up test code

fix: factor out test_utils, clean-up test code #182