Models unit tests fixes