Updated models after unit testing