Issue #96 fixed tests, indentation and updated UML