Fixup tests and pcl usage in CMakeList.txt