Updated core classes and testcases for opensource release