update decoder & add batch test