refactor - moved tests case to class and  method
Merge pull request #27 from grogy/test-refactor

refactor - moved tests case to class and  method