More tests for new format client ids