Makefile: Moved flags upwards
Tests: Made Client tests working
Makefile: Point to correct CppUTest dir
Made Server tests working
Merge branch 'test-setup' into develop