Windows service tests fixed