Fix the pxc-testing and clean it up a bit, also add the ONBUILD parts