test.py: Add --sim option
test.py update: add --sim, beautify output
Merge branch 'master' into macosx.testing.branch