Modifications to Test classes
Merge pull request #5 from sperera/master

Modifications to Test classes