Model and Tests Update