@betravis fixed in bdc6381dd038299471217904f55b6c3c232abd7a. @astearns - this commit doesn't actually have those tests, but the next PR will build include them to build out all of the cases.