## For #26229 This is the 2nd iterative PR for this ticket. It includes: - tests with a new testing utility - refactored argument and class names - another batch of UI updates - [x] Added/updated automated tests - [x] Manual QA for all new/changed functionality --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com>