Refactor tests
Fix class name
Merge pull request #14 from hyperoslo/refactor/tests

Refactor/tests