Windows service test fixes