Further modifications to Windows unit testing.