Fix/improve 2p2cni waterair test

Fixes #851 (closed)

I cleaned up the test and fixed the time step size in order to get a more robust test. Hope this works.