systematic bytes handling; fix unit test