statement coverage 99%
Improve further for branch coverage