Adding tests for models
Changing outputter to have method on self