Yet another unit-test update