Merge changes I4edd999d,I6dab5be8

* changes:
  Fix several tests that were worded incorrectly
  Allow separation of path and certs