Fix failing test-case diagnostic due to pulling #1353.
Merge pull request #2202 from AndrejMitrovic/Fixup1353

Fix failing test-case diagnostic due to pulling #1353.