Made test classes final
Extended comments and added tests
Improved code coverage
Improved code coverage