Cleaning up yield tests