[#2014] additional updates to iapitest
[#2014] fix errors introduced by cppcheck fix