Test code now runs fully with new format