Good catch here.  But, I think we'll need to update the unit tests to make them work with this change now.  Should be a small fix.