Added more tests for the model.

WIP with testbuildertest