Cleaned up test code.
Merge pull request #5 from iampseudo/dev

Cleaned up test code.