Additionnal UT
UT class S: some refactoring
UT class S: some refactoring