revert some egregious test changes