adapting test scenarios (even the @old-ui)