Fixing tests to reflect language changes