Bring S17-concurrency tests up to spec