#144 Correction of unit tests
Merge branch 'master' into acceptance