Fixing endpoints when outside of the context of tests