Revise tests to work a little more intentionally.