Daira's patch to fix an error that was causing existing tests to fail
Reframes new unit test in terms of Daira's patch