Working MPI tests and some minor shuffling.