Issue 4, test suite updated, need to do the scenarios