Added some unit test fixes to work with the new model