Updating the diagram file and fixing a test method.