More tests for flattening, no code changes