Update test fixtures, cover more corner cases.