Adapt tests to new output