Also need test cases for those new if branches.