Follow up to fix failing unit tests - HTML-523