Refactor PARTITION-FINITE-SET and fix test call