Initial work on PE 70; some formatting cleanups in tests.