Updated versions to 3.1-SNAPSHOT
Normalise line endings so test works equally on windows/nix