Added some more targeted tests in fixing the error