Issue 609: revert wrong change on cert tests