[#1692] follow testing pattern proposed in #1672