Merge "Add Additional Junit and fix Sonar new bug."