fix cpp test compile bug introduced in last commit
Merge branch 'master' into cell_lists_callback
fix a test I broke in the previous commit