Adapt S17 tests to reorganized structure