increasing test coverage, removing unneeded branches