Merge "add tests for certificates"