Sort keys in JSON output
Fixing broken doctests in util.py, broken test order in Makefile