Adding functional tests for single scenario execution