Merge features.common and test-utils