ran win32 tests
test
Merge branch 'develop' into initcond
merge and run 64 bit tests