Refactored model tests

Felt mocking was being wrongly implemented. redid model tests