Improve code covarage