Fix unittests.
More Composition test more strict.