tests + domain draft
ref
Merge branch 'story4' into team04
story2