Fixed up basic test and patched up concurrent classes for Windows.