General cleanup and improvements

- Use multidict again for tracking change ids to commits.
- Improve testing