Small modifications to make existing tests pass after recent changes.