Made some changes to speed up slow tests.