Add blocking in unit tests for more determinism

+1 on that.