Cleaning up some of the test code

simplified Fetcher import and added informative test error messages