Tests update

Updated all tests to pass for the newly renamed and created models.