Add test-race, and add -race to test-long and test-long-verbose
Merge branch 'race' into concurrency
Fix main and testing