Merge "Test for certificate generation using mark and reset"