Merge "fixed some JUnits"

No match.