Remove common_helpers.py and update tests using it