Updated to fix counting issue with 'state' between tests. (not TBX2UTX test yet)