Feature/244 replace 1 1 in scenarios with actual values

https://trello.com/c/1zg5OMhB/244-replace-1-1-in-scenarios-with-actual-values