Improved the automated tester.
Merge pull request #22 from Winston-Chan/nathan

Improved the automated tester.