Adapt tests to modified code