Add missed CPPFLAGS cleanup
Fix tests after a96ef57d