Tweak tests to reflect new layout/wording