Both Gao's and my MPI functions are now all in one file and work with the rest of the framework, including the tests