Refactored test classes
Merge pull request #3 from impetus-opensource/modifiedtestclasses

Refactored test classes