Cleanup of duplicated logic, and leftover methods on test_helper