Fixed tests that were using deprecated gmx.ff and gmx2.ff.

While at it, updated the mdp files also.

Change-Id: I83aad6ced3d9338fccd83f8d20ab7f6af6f3aa6b