Added rest of model tests