Fixed all failures in Model testing