B-60870 tweaking slow tests to remove unnecessary code