fixes for external users to get past unit tests with fewer cores.