Job: #112 #113 Add test model