add test and update API call + domain structure