fix language switch and add missing test