Clean tests
Update simpletest repo, and fix typos
Merge pull request #6 from joecohens/cleanup-tests

Clean tests