Removed a redundant diagnostic and replaced it with a more standard one.  Added a test case for the diagnostic.