Add race condition testing to CI

 * also fix our 2 race conditions