(PUP-3222) Windows service integration tests

Additional changes / integration tests for review