Added another method on model, and a few more tests.