Merge "Replace junit4-target with junit"