Cleaning up the URL helper, removing unit test capabilities for now