Test case generation tweaks

- Sort keys properly
- Include bug number