Adjusted the tests
Merge branch 'Server' of https://github.com/vid14114/TDI.git into Server

Conflicts:
	TDI/src/model/Server.java