Fixed broken tests inside test/test_sets and a few minor cosmetic things