Add some more testing to cover the remaining two cases where