Moved proxy utility to testing.  Also now doesn't fail miserably when an exception occurs.