Remove duplicate test target in CCache Makefile
Neaten up test-suite Makefile regeneration