Cut this down to just the methods used by the above tests. Later PRs can progressively add stuff.