organizations tests + refactor on from_dict