Modify test methods
Merge pull request #45 from Doha2012/master

Modify test methods