Amend and extend the tests a bit.