add s2 s3 s5 to Changes and the list of exports for the tests (need to centralize that list for DRY)