r9229: new tests