Set: complete tests + little fixes in actual classes