Import some of my old tests.
Fix typo.
Merge pull request #38 from Ms2ger/master

Import various tests