Minor reworks.
Add another test. It currently fails with MPI.