Fixed model tests, working on service object tests