Updated tests to reflect fix for gh-1987