Class S: Deprecated isVoid, reorganize UT
Some reorganization into UT + new tests