Thanks!!! I hope so...I'm feeling confident, but only gonna be 100% safe when I see an official CBL chart somewhere. The IRCC official Twitter account has answered other things in the meantime, but not yet my question...maybe they're as lost as us.
As for my CE and EE tests, I don't really see any magic trick. For the CE, I've read some literary novels and lots (lots) of Le Monde as well as some niche stuff (technology, football, etc.), and went through the Prepmyfuture simulations as well. For the EE, I've taken classes with a teacher who read and corrected my texts. Apart from accents, orthography and punctuation (no way but reading and writing ad nauseam), my main trouble was not making style mistakes (I'm a Brazilian; Portuguese writing doesn't necessarily translate directly into French writing). My teacher always recommended me to keep it as simple as possible.
Many (many) logical connectors between sentences, always keeping it to subject + verb + object (in that order), and using the pronouns (including y and en) as well as I could.