Move the Navier-Stokes test out of combined

Also removes the simple_diffusion test.

Refs #3036.