More tweaks to models.
Added OCMock for other tests.
Some minor clean up.