Merge "Test config should use manifest package attribute"