Merge "Expand character set detector tests" into lmp-dev