Updated models after unit testing
Merge commit '41833ac'