Added coverage reporting + addition unit tests