yield tests and fixes