Fixed tests after merging "thing-ui"