US543 - added a few more tests cases for additional error scenarios