Looks to me like lines 179 through 183 now precisely test the same behavior as lines 169 through 172. Can you either differentiate these somehow, or delete lines 179 through 183? (Or am I mistaken?)