adjusting testMapSSpans to new relannis spec
adjusting testMapSToken and testMapSTokenAnnotation to new relannis spec