Merge "Replace core-junit with legacy-test"