Small refactor in test_s.