Unit Testing, Adjusting Classes

^Title
Dino, Mathias, Tarik, Sepideh