Fix some serious concurrency issues in the test suite
Update the Simple test now that we automatically remove more clang flags