made a separate test context for easier testing and updated appropriate ...

...model test files