Merge pull request #1893 from brendan-lynch/master

[TEST] Fixed failing unit test.