Improve dependencies. Move mpx testing into mpx.c.