Removes test and fixes language codes