Minor cleanup, to move failing (and not immediately fixable) problem to set of failing tests