Add default attributes
Fix tests