Merge pull request #3 from snipertomcat/master

pull my finger
Merge pull request #5 from TheDesignAffiliatesInc/master

Changes to the test directory