Add xscope-wrapper to Makefiles
Make unit tests compile