fix and tests for the new s2gs fields