Windows: Reduce CLI time, move some to unit tests Upstream-commit: 9de21de4531e01169d903751ab48a29457769610 Component: engine