Add missing tests for refactored functions

This MR adds a set of tests that were previously missing, and covers some functions we want to refactor to use Do instead of the legacy setup. Merging these first ensures no regressions in the updated functions.

Relates to !2674 (merged)