Update Model and begin to add unit test on it.