Correct some bulk feature tests and tweak some settings