Update for language changes
Update tests for language changes