Fix mistaken deletion in unit test.
Merge branch 'garth/fix-issue-263' into next