More versatile test