Diagrams updated
Tests added for PhpUnit