Fixes #1865. Refs #1843.
This further decouples these tests from the implementation (i.e. which controller are we calling?).