Replaced tests for certain errors

Rather than modify the test code, decided to leave in some "quality
assurance" tests