Fix up test cases disturbed by additions to test data fixture