Fix missing variable.
Merge both tests into a single file.

This is to avoid an error with reinitializing MPI
in the second test after finalizing it in the
first test.