re-enabled tests.
Merge branch 'master' of github.com:sebmartel/s2g-server