Fixed test and fixed merging off attributes in expert template