Disruption: refactor raptor adapted test