Task #347: More work on tests
Task #347: Re-organize tests
Issue #347: Initial commit of working scenario