Fixed error messages which printed the same prefix twice

Also updated tests to pass with new error messages