Revert to old cert names, use a subdir for test conf dir.