fixing LC test cases and adding new features required by ES