Moved test to new class
Merge pull request #2 from brian978/develop

Moved test to new class