Fixes test issue with new block yielding scheme