Issue #253: Add mock dependency control helpers in tests