CB 6141 - Fix Windows 8 tests