Fixing language and role mappings to use new classes, all tests now passing, but still several errors being caught in role parsing