Improve unit tests
Merge pull request #3 from devhub-tud/improve-testing

Improve unit tests