Fix makefile unit tests broken by previous commits
Convert VCCLCompilerTool to call arrays