Tweaked test for more complete coverage