Merge "Fixed coretest DisabledTest"