Major Description
SOme tests still look for Windows via a search of the OS string. Since we have a utility function, now, it makes sense to refactor all of those to use that function. That way, if we ever need to change the logic there is only one place to worry about it.