Loads more tests.
Merge pull request #4 from mchitten/testing

Loads more tests.