Fixed build problems, fixed CPPUTest install