Split attribute, fix tests