Adding moar test coverage