Follow up to  fix failing unit tests - TRUNK-4436