Updating class diagram version 2 and test_norvig