Inprove code coverage