Correct some missed test errors.

Change-Id: I78cd3d458df193a0d6d7d33fa758da91659966b6
Added SSL support.

Change-Id: Ic379119cbd807471b611e9e0db3c2dea1c7ed040