Update tests to take into account code changes in certificate validation