More tests.
Merge pull request #6 from daisieh/master

More tests.