All test models now compile in c++