Fix, expand and tweak tests.