fix and simplify concurrent wait calls test