switch scenario parsing if conditions to use newer api
#60 started refactoring of validators