Organizing test cases
Merge pull request #224 from iameric1986/master

Organizing test cases