Adapted test to changes