Complete the model, add initial tests.