Fix unittests.
Bug fix for creator.