Minor fixes in some test models