Improve testing and coverage report