Corrected Unit tests with new Model paradigm