Add tweaks to remove tests in cross section