Rework tests to use the right block waits