Upgrade to 128-bit counter
Improve conciseness in tests