OK, sorry about that misunderstanding.  Fixed and tests passing locally now.