cleanup of scenario tests, refactored modification label