Modifications fo older tests

In order to make them fully compatible with the new requirements of the
scenario builder.