Some fixes
More test-scenario scripts