Making the tests better, setting up details of the model