Fixed all Tests for first deliverable, and fixed UML.