Merge pull request #8 from melmothx/master

Fixed test scripts.