Fixed unit test problems running in Windows 8