Merge pull request #301 from claar/develop

Fix unit tests.