Added a couple of tests, changed models