Minor improvements in the new condvar test