Fix fallout in tests