Adapt tests to the new parameters