Imrove code coverage of tests