* WIP: adding scenario-tests * Scenario test part 1 feature complete * revert exec changes * fixing up code review comments