Fixing unit tests
Merge pull request #82 from ethz-asl/fix/unit-tests

Fixing unit tests