fixup! TB4: Unit tests

Note: many more functional tests could be made here