Bug 14310 [QA Followup] - Adapt existing code to use new methods