cpp: fixes to get disable full constructor tests to pass