More careful merge of #288 test