Updated tests
Updated model