Stylistic changes to test_util.py and test_mirrors.py.