Cleanup - fix TODO, revert threadcount to what it should be, and add another test.