Issue #95 fixed indentation, tests, updated UML

Small fixes to scenario