Fix tests according to cleanup of old Attributes