Small test cleanup
Merge branch 'minissl' into minissl-looker