Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
* [MM-40144] Restructure tests, add test case numbers, some cleanup * Fix a test