Rewrite current changelog entry by grouping items
Fix yet another test name/path