Refs #140 | Fix logic, add tests that go down all branches