Added Rasmus changes on RestServer & TestProject