Extend test to check all branches