tests fixing, add test for model