US25-CodeReview for all packages

Fixed UnitTests