Fix mpi test

Now up to date with restructure