Improved branch coverage