More unit test fixes to work with AppVeyor.