Remove scheme from Language object, fix Language UnitTest