Merge "Adding JUnits for additional coverage"