Finally migrated towards extended Tensors, passing all unit tests.