Merge "Fix the Angular Test Issues"