Fixed unit tests
Added Model.Listener