Updated tests for Model