#544 : repairing some broken structure unittests