Added more unit testing and also coverage reports