Updated models and unit tests up to middle of I classes