HCSVLAB-472: Add tests and fix language code bug