Merge pull request #18 from lrasinen/master

Fix tests