Fixup test code and requiretls check