Merge "fixed some JUnits"