feat: Add test variant

* Local variant for test
* a bit in between what was first and remote bitstream introduced a few
  commit ago. I don't knowwhat I will keep...