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

Basically I fixed the tests that were broken in #1446 and also @xsuchy's feedback.