* Add model mocks to TestHelper * Address feedback
* Validate props * Add calls changes and fix attachments * Address feedback