Ahh - the diff I didn't see the different OS stuff.  I can refactor it tomorrow to pull out what is actually different (if anything), otherwise I think we're just wasting cycles to test the same thing twice (?three times with default?) as a separate PR.  That's all that caught my eye with this.  LGTM