Added more tests for code coverage.
100% code coverage
Moved tests under appropriate class.