Updated issues with models and unit testing