Improve factories, especially bounty factories, and use them to streamline tests.