Update UnitTests + Class Diagram