Fixes to scenaio tests integration