Update test with new ident form
Collapse preserves grouping
Add missing S3 decls & update docs