peer review for integration test 3a and updated other stuff to reflect changes made
Merge branch 'master' of https://github.com/Liso/DESystem