Fix test a bit
Add domain models' skel