added first tests for composite-dataunit and fixed some bugs