Fix incomplete tests
Merge pull request #77 from SlikNL/unit-tests

Fix incomplete tests