use branding type from Branding, not product attrs

add new branding info to test data with OS in name