Add test for Model inheritance
Add UI tests + fixes accordingly