@macta, To validate my refactoring of generation, I'm comparing existing tests to what "would" be generated. There are some anomalies that may just need some background info.
To try to keep things organised, I'm going to put a query per post. Could you each of my posts if you have any comment.