Added Set + tests