Adapts tests to changes