Fix unit tests.
Merge pull request #62 from analytically/master

Fix unit tests.