Add more unit tests and increase code coverage where ever possible
Add more unit tests and increase code coverage where ever possible