Implement divergence removal function.
Separate MPI and serial tests in makefile.