Enable branch coverage, improve test