BUG-10204 Addendum fixes two tests