Add tests, edit set functionality