Restore custom option tests and add secure version.

It turns out that adding the custom secure options to the "custom
options" test was a bad idea. This altered the test to only test it
using a secure connection.

This commit reverts that change and duplicates the tests for checking
the secure connection.