Merge pull request #5 from pkruithof/master

Fixed tests