Added tests - 68% code coverage
Remaned test class module to better reflect which class is being tested