Add structure fof unittests