US25-CodeReview for all packages

More fixing for Norvig Class and Unit Tests