Further testing in support of #29