Fixing tests from #1446 so we can release the 1.1.2 puddle