Merge pull request #3 from eriksvedang/master

more tricky tests :)