Trying to up testing coverage a bit: