diff --git a/.github/workflows/mcg-ci.yml b/.github/workflows/mcg-ci.yml
index 15014527..00b27900 100644
--- a/.github/workflows/mcg-ci.yml
+++ b/.github/workflows/mcg-ci.yml
@@ -124,6 +124,13 @@ jobs:
           run: |
             cd /opt/metacg/tools/cgcollector2/test
             bash testBase.sh
+      - name: Run CaGe tests
+        uses: addnab/docker-run-action@v3
+        with:
+          image: metacg-devel:latest
+          run: |
+            cd /opt/metacg/build/tools/cage/test
+            ./runCaGeTests.sh
       - name: Run cgvalidate tests
         uses: addnab/docker-run-action@v3
         with: 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1efa8722..c5c43ee1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -145,6 +145,7 @@ build-mcg:
       -DMETACG_BUILD_CGCOLLECTOR=ON
       -DMETACG_BUILD_GRAPH_TOOLS=ON
       -DMETACG_BUILD_CGPATCH=ON
+      -DCAGE_USE_METAVIRT=ON
       -DCGPATCH_USE_MPI=OFF
       -DMETACG_BUILD_PYMETACG=ON
       -DMETACG_BUILD_PYMETACG_TESTS=ON
@@ -269,6 +270,19 @@ test-cgcollector2:
     - cd tools/cgcollector2/test/
     - ./testBase.sh -b $MCG_BUILD
 
+test-cage:
+  <<: *job-setup
+  parallel:
+    matrix:
+      - GCC: 11
+        LLVM: [16.0.6, 17.0.6, 18.1.8]
+  stage: integration-test
+  needs: ["build-mcg"]
+  script:
+    - module load clang/$LLVM
+    - cd $MCG_BUILD/tools/cage/test
+    - ./runCaGeTests.sh
+
 test-basic-pgis:
   <<: *job-setup
   stage: integration-test
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c57df7d..cf535882 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,6 +91,29 @@ option(
 if(METACG_BUILD_GRAPH_TOOLS)
   # New MetaCG tools based on the graphlib
   include(ClangLLVM)
+
+  # Determine if we can build CaGe
+  if(${LLVM_PACKAGE_VERSION}
+     GREATER
+     15
+  )
+    set(BUILD_CAGE ON)
+
+    option(
+      CAGE_USE_METAVIRT
+      ON
+      "Rely on metavirt for virtual call handling"
+    )
+
+    if(${CAGE_USE_METAVIRT})
+      include(metavirt)
+    endif()
+
+  else()
+    set(BUILD_CAGE OFF)
+    message(STATUS "Skipping CaGe: requires LLVM version 16 or higher")
+  endif()
+
   add_subdirectory(tools)
 endif()
 
@@ -125,6 +148,7 @@ if(METACG_BUILD_CGPATCH)
     message(STATUS "Skipping CGPatch: requires LLVM version 15 or higher")
   endif()
 endif()
+
 # PIRA analyzer Should PGIS be built
 option(
   METACG_BUILD_PGIS
diff --git a/cmake/metavirt.cmake b/cmake/metavirt.cmake
new file mode 100644
index 00000000..cc60f666
--- /dev/null
+++ b/cmake/metavirt.cmake
@@ -0,0 +1,14 @@
+set(METAVIRT_LOG_LEVEL
+    "0"
+    CACHE STRING "MetaVirt log level from 0 (least verbose) to 4 (most verbose)"
+)
+
+FetchContent_Declare(
+  metavirt
+  GIT_REPOSITORY https://github.com/ahueck/llvm-metavirt.git
+  GIT_TAG devel
+  GIT_SHALLOW 1
+  FIND_PACKAGE_ARGS
+)
+
+FetchContent_MakeAvailable(metavirt)
diff --git a/container/full-build b/container/full-build
index db94b115..0adf7929 100644
--- a/container/full-build
+++ b/container/full-build
@@ -47,6 +47,7 @@ RUN cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Debug \
       -DMETACG_BUILD_GRAPH_TOOLS=ON \
       -DMETACG_BUILD_CGPATCH=ON \
       -DMETACG_BUILD_GRAPH_TOOLS=ON \
+      -DCAGE_USE_METAVIRT=ON \
       -DMETACG_BUILD_PYMETACG=ON \
       -DPython_ROOT_DIR=/opt/metacg/.venv \
       -DPYTEST_EXECUTABLE=/opt/metacg/.venv/bin/pytest \
diff --git a/graph/src/Callgraph.cpp b/graph/src/Callgraph.cpp
index 0cd10ed8..8dcd4ee1 100644
--- a/graph/src/Callgraph.cpp
+++ b/graph/src/Callgraph.cpp
@@ -42,6 +42,7 @@ CgNode* Callgraph::getMain(bool forceRecompute) const {
 
 CgNode& Callgraph::insert(const std::string& function, std::optional<std::string> origin, bool isVirtual,
                           bool hasBody) {
+  assert(!function.empty() && "Function name must not be empty");
   NodeId id = nodes.size();
   // Note: Can't use make_unique here because make_unqiue is not (and should not be) a friend of the CgNode constructor.
   nodes.emplace_back(new CgNode(id, function, std::move(origin), isVirtual, hasBody));
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index dcf82e8b..6ddc252a 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -4,3 +4,6 @@ add_subdirectory(cgconvert)
 add_subdirectory(cgformat)
 add_subdirectory(cgdiff)
 add_subdirectory(cgquery)
+if(BUILD_CAGE)
+  add_subdirectory(cage)
+endif()
diff --git a/tools/README.md b/tools/README.md
index 9a1bec46..b9788eed 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -2,6 +2,49 @@
 
 This folder contains tools for creating and merging call graphs using the MetaCG graph library.
 
+## CaGe
+
+CaGe is MetaCG's link-time call graph generator.
+To use it, the target application needs to be built with (full) LTO using the LLD linker.
+
+### Basic Usage
+Let's consider a project that consists of two source files, `example_a.cpp` and `example_b.cpp`.
+A standard build process consists of a compile and a link step:
+```
+# Compile step
+clang++ example_a.cpp -o example_a.o
+clang++ example_b.cpp -o example_b.o
+
+# Link step
+clang++ example_a.o example_b.o -o example
+```
+
+Modifying this build process to generate a call graph with CaGe is straightforward.
+All necessary compile flags can be generated with `metacg-config`:
+
+```
+# Compile step
+clang++ $(metacg-config --cage-cxxflags) example_a.cpp -o example_a.o
+clang++ $(metacg-config --cage-cxxflags) example_b.cpp -o example_b.o
+
+# Link step
+clang++ $(metacg-config --cage-ldflags --cage-pass-option -cg-file=example.mcg) example_a.o example_b.o -o example
+```
+
+### Build system integration
+Integrating CaGe into build systems, e.g. Make and CMake, is simple.
+Many Make projects already define `CXXFLAGS` and `LDFLAGS` variables, which can be extended with the respective 
+`metacg-config` output.
+For CMake projects, the relevant options are `CMAKE_CXX_FLAGS`, `CMAKE_EXE_LINKER_FLAGS` and `CMAKE_SHARED_LINKER_FLAGS`.
+
+### Pass options
+Pass options can be set by passing `--cage-pass-option <option>(=<val>)`  to `metacg-config`.
+Available options:
+- `-cg-file=<filename>`: The output file for the generated call graph.
+- `-pta=no/signature`: Controls the behavior of the points-to analysis for resolving indirect calls. Available options are:
+  - `no`: Indirect calls are ignored.
+  - `signature`: Adds all functions with matching signature as potential call targets.
+
 ## CGMerge2
 
 CGMerge2 is a front-end for MetaCG's call graph merging functionality. 
diff --git a/tools/cage/CMakeLists.txt b/tools/cage/CMakeLists.txt
new file mode 100644
index 00000000..8399bf6c
--- /dev/null
+++ b/tools/cage/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory(src)
+add_subdirectory(test)
+
+install(TARGETS cage cage-plugin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/tools/cage/include/cage/Plugin.h b/tools/cage/include/cage/Plugin.h
new file mode 100644
index 00000000..1635793b
--- /dev/null
+++ b/tools/cage/include/cage/Plugin.h
@@ -0,0 +1,22 @@
+/**
+ * File: Plugin.h
+ * License: Part of the MetaCG project. Licensed under BSD 3 clause license. See LICENSE.txt file at
+ * https://github.com/tudasc/metacg/LICENSE.txt
+ */
+#ifndef METACG_CAGE_PLUGIN_H
+#define METACG_CAGE_PLUGIN_H
+
+#include "llvm/Pass.h"
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Passes/PassPlugin.h"
+
+namespace cage {
+
+struct CaGe : llvm::PassInfoMixin<CaGe> {
+  llvm::PreservedAnalyses run(llvm::Module& M, llvm::ModuleAnalysisManager& MA);
+
+  static llvm::StringRef name() { return "CaGe"; }
+};
+}  // namespace cage
+
+#endif  // METACG_CAGE_PLUGIN_H
diff --git a/tools/cage/include/cage/generator/CallGraphConsumer.h b/tools/cage/include/cage/generator/CallGraphConsumer.h
new file mode 100644
index 00000000..379f299d
--- /dev/null
+++ b/tools/cage/include/cage/generator/CallGraphConsumer.h
@@ -0,0 +1,22 @@
+/**
+ * File: CallGraphConsumer.h
+ * License: Part of the MetaCG project. Licensed under BSD 3 clause license. See LICENSE.txt file at
+ * https://github.com/tudasc/metacg/LICENSE.txt
+ */
+#ifndef METACG_CALLGRAPHCONSUMER_H
+#define METACG_CALLGRAPHCONSUMER_H
+
+namespace metacg {
+class Callgraph;
+}
+
+namespace cage {
+
+struct CallGraphConsumer {
+  virtual ~CallGraphConsumer() = default;
+  virtual void consumeCallGraph(metacg::Callgraph&) = 0;
+};
+
+}  // namespace cage
+
+#endif  // METACG_CALLGRAPHCONSUMER_H
diff --git a/tools/cage/include/cage/generator/CallgraphGenerator.h b/tools/cage/include/cage/generator/CallgraphGenerator.h
new file mode 100644
index 00000000..ac9e4010
--- /dev/null
+++ b/tools/cage/include/cage/generator/CallgraphGenerator.h
@@ -0,0 +1,30 @@
+/**
+ * File: CallGraphGenerator.h
+ * License: Part of the MetaCG project. Licensed under BSD 3 clause license. See LICENSE.txt file at
+ * https://github.com/tudasc/metacg/LICENSE.txt
+ */
+#include "cage/generator/CallGraphConsumer.h"
+
+#include "io/MCGWriter.h"
+
+#include "llvm/IR/Module.h"
+#include "llvm/IR/PassManager.h"
+
+namespace cage {
+
+enum PTAType { No, BySignature };
+
+class Generator {
+ public:
+  explicit Generator(PTAType ptaType) : ptaType(ptaType) {};
+
+  void addConsumer(std::unique_ptr<CallGraphConsumer> consumer) { consumers.push_back(std::move(consumer)); }
+
+  bool run(llvm::Module& M, llvm::ModuleAnalysisManager* MA);
+
+ private:
+  PTAType ptaType;
+  std::vector<std::unique_ptr<CallGraphConsumer>> consumers;
+};
+
+}  // namespace cage
diff --git a/tools/cage/include/cage/generator/FileExporter.h b/tools/cage/include/cage/generator/FileExporter.h
new file mode 100644
index 00000000..6a007f55
--- /dev/null
+++ b/tools/cage/include/cage/generator/FileExporter.h
@@ -0,0 +1,26 @@
+/**
+ * File: FileExporter.h
+ * License: Part of the MetaCG project. Licensed under BSD 3 clause license. See LICENSE.txt file at
+ * https://github.com/tudasc/metacg/LICENSE.txt
+ */
+#ifndef METACG_FILEEXPORTER_H
+#define METACG_FILEEXPORTER_H
+
+#include "cage/generator/CallGraphConsumer.h"
+
+#include <string>
+
+namespace cage {
+
+class FileExporter : public CallGraphConsumer {
+ public:
+  FileExporter(std::string outfile) : outfile(outfile) {}
+  void consumeCallGraph(metacg::Callgraph&) override;
+
+ private:
+  std::string outfile;
+};
+
+}  // namespace cage
+
+#endif  // METACG_FILEEXPORTER_H
diff --git a/tools/cage/src/CMakeLists.txt b/tools/cage/src/CMakeLists.txt
new file mode 100644
index 00000000..f9873c3a
--- /dev/null
+++ b/tools/cage/src/CMakeLists.txt
@@ -0,0 +1,7 @@
+include(AddLLVM)
+
+add_llvm_pass_plugin(cage-plugin Plugin.cpp)
+target_include_directories(cage-plugin PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/tools/cage/include>)
+target_link_libraries(cage-plugin PRIVATE cage)
+
+add_subdirectory(generator)
diff --git a/tools/cage/src/Plugin.cpp b/tools/cage/src/Plugin.cpp
new file mode 100644
index 00000000..77c81688
--- /dev/null
+++ b/tools/cage/src/Plugin.cpp
@@ -0,0 +1,97 @@
+/**
+ * File: Plugin.cpp
+ * License: Part of the MetaCG project. Licensed under BSD 3 clause license. See LICENSE.txt file at
+ * https://github.com/tudasc/metacg/LICENSE.txt
+ */
+#include "cage/Plugin.h"
+
+#include "llvm/IR/LegacyPassManager.h"
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Passes/PassPlugin.h"
+
+#include "cage/generator/CallgraphGenerator.h"
+#include "cage/generator/FileExporter.h"
+
+using namespace llvm;
+
+using namespace llvm::cl;
+
+static OptionCategory cageOpts("CaGe");
+
+static opt<bool> cageVerbose("cage-verbose", desc("Print debugging output"), cat(cageOpts), init(false));
+
+static opt<cage::PTAType> pta(
+    "pta", desc("Points-to analysis of indirect calls:"),
+    values(clEnumValN(cage::PTAType::No, "no", "Ignore indirect calls"),
+           clEnumValN(
+               cage::PTAType::BySignature, "signature",
+               "Treat all available valid function signatures for a given function pointer as potential call target ")),
+    cat(cageOpts), init(cage::PTAType::No));
+
+static opt<std::string> cgout("cg-file", desc("Output file for the generated call graph"), cat(cageOpts), init(""));
+
+namespace cage {
+PreservedAnalyses CaGe::run(Module& M, ModuleAnalysisManager& MA) {
+  if (cageVerbose) {
+    outs() << "Running CaGe in verbose mode\n";
+  }
+
+  // First check explicit option
+  std::string outfile = cgout.getValue();
+  if (outfile.empty()) {
+    // If empty, check environment variable
+    const auto* cgNameEnv = std::getenv("CAGE_CG");
+    if (cgNameEnv) {
+      outfile = cgNameEnv;
+    } else {
+      // Default output file
+      outfile = "cage_callgraph.mcg";
+    }
+  }
+
+  Generator gen(pta);
+  gen.addConsumer(std::make_unique<FileExporter>(cgout));
+
+  if (!gen.run(M, &MA))
+    return PreservedAnalyses::all();
+
+  return PreservedAnalyses::none();
+}
+}  // namespace cage
+
+llvm::PassPluginLibraryInfo getPluginInfo() {
+  return {
+    LLVM_PLUGIN_API_VERSION, "CaGe", "0.2", [](PassBuilder& PB) {
+    // allow registration via optlevel (non-lto)
+#if LLVM_VERSION_MAJOR >= 20
+      PB.registerOptimizerLastEPCallback([](ModulePassManager& PM, OptimizationLevel, ThinOrFullLTOPhase) {
+#else
+      PB.registerOptimizerLastEPCallback([](ModulePassManager& PM, OptimizationLevel) {
+#endif
+        outs() << "Registering CaGe to run during opt\n";
+        PM.addPass(cage::CaGe());
+      });
+
+      // registering via optlevel during lto appears to still be broken
+      PB.registerFullLinkTimeOptimizationLastEPCallback([](ModulePassManager& PM, OptimizationLevel o) {
+        outs() << "Registering CaGe to run during full LTO\n";
+        PM.addPass(cage::CaGe());
+      });
+
+      // allow registration via pipeline parser
+      PB.registerPipelineParsingCallback(
+          [](StringRef Name, ModulePassManager& MPM, ArrayRef<llvm::PassBuilder::PipelineElement>) {
+            if (Name == "CaGe") {
+              outs() << "Registering CaGe to run as pipeline described\n";
+              MPM.addPass(cage::CaGe());
+              return true;
+            } else {
+              outs() << "Did not register CaGe\n";
+            }
+            return false;
+          });
+    }
+  };
+}
+
+extern "C" LLVM_ATTRIBUTE_WEAK ::llvm::PassPluginLibraryInfo llvmGetPassPluginInfo() { return getPluginInfo(); }
\ No newline at end of file
diff --git a/tools/cage/src/generator/CMakeLists.txt b/tools/cage/src/generator/CMakeLists.txt
new file mode 100644
index 00000000..72fdae68
--- /dev/null
+++ b/tools/cage/src/generator/CMakeLists.txt
@@ -0,0 +1,12 @@
+add_library(cage STATIC CallGraphGenerator.cpp FileExporter.cpp)
+set_target_properties(cage PROPERTIES POSITION_INDEPENDENT_CODE ON)
+target_include_directories(cage PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/tools/cage/include>)
+target_include_directories(cage PUBLIC $<BUILD_INTERFACE:${LLVM_INCLUDE_DIRS}>)
+
+if(${CAGE_USE_METAVIRT})
+  target_link_libraries(cage PRIVATE metavirt::Types)
+  target_compile_definitions(cage PRIVATE "HAVE_METAVIRT")
+endif()
+
+target_link_libraries(cage PUBLIC metacg::metacg)
+add_config_include(cage)
diff --git a/tools/cage/src/generator/CallGraphGenerator.cpp b/tools/cage/src/generator/CallGraphGenerator.cpp
new file mode 100644
index 00000000..190902e4
--- /dev/null
+++ b/tools/cage/src/generator/CallGraphGenerator.cpp
@@ -0,0 +1,176 @@
+/**
+ * File: CallGraphGenerator.cpp
+ * License: Part of the MetaCG project. Licensed under BSD 3 clause license. See LICENSE.txt file at
+ * https://github.com/tudasc/metacg/LICENSE.txt
+ */
+#include "cage/generator/CallgraphGenerator.h"
+
+#include "Callgraph.h"
+
+#ifdef HAVE_METAVIRT
+#include "metavirt/VirtCall.h"
+#endif
+
+#include "llvm/Analysis/CallGraph.h"
+#include "llvm/Demangle/Demangle.h"
+#include "llvm/IR/Function.h"
+#include "llvm/Passes/PassBuilder.h"
+#include "llvm/Support/raw_ostream.h"
+#include "llvm/Transforms/IPO/WholeProgramDevirt.h"
+#include "llvm/Transforms/Utils/ModuleUtils.h"
+
+#include "llvm/IR/DebugInfo.h"
+#include "llvm/IR/InstVisitor.h"
+
+#include <cxxabi.h>
+
+using namespace llvm;
+
+namespace cage {
+
+struct CallBaseVisitor : public llvm::InstVisitor<CallBaseVisitor> {
+  CallBaseVisitor(llvm::CallGraph* lcg, PTAType pta) : lcg(lcg), pta(pta), mcg(std::make_unique<metacg::Callgraph>()) {
+    const Module& m = lcg->getModule();
+    llvm::DebugInfoFinder dbg_finder{};
+    dbg_finder.processModule(m);
+    metaDataAvail = dbg_finder.subprogram_count() != 0;
+
+    for (const auto& i : dbg_finder.subprograms()) {
+      if (auto f = m.getFunction(i->getName())) {
+        // We found the function with its normal name (C-Style function)
+        functionInfoMap[f] = i;
+      } else if (auto f = m.getFunction(i->getLinkageName())) {
+        // We found the function via the linkage name (mangled name / C++ function)
+        functionInfoMap[f] = i;
+      } else {
+        // assert(false);
+      }
+    }
+
+    // Only build signature map if required for PTA
+    if (pta == BySignature) {
+      for (const auto& func : m.getFunctionList()) {
+        signatureFunctionMap[func.getFunctionType()].push_back(&func.getFunction());
+      }
+    }
+  }
+
+  ~CallBaseVisitor() = default;
+
+  void visitCallBase(llvm::CallBase& I) {
+    if (I.getCalledFunction() != nullptr && I.getCalledFunction()->isIntrinsic())
+      return;
+    auto* currentFunction = I.getParent()->getParent();
+    auto& currentNode = mcg->getSingleNode(currentFunction->getName().str());
+    if (metaDataAvail) {
+      size_t numAddedCalls = addVirtualCallTargets(I, currentNode);
+      // This function pointer was a virtual call base, so we do not need to run the overapproximation
+      if (numAddedCalls != 0)
+        return;
+    }
+
+    if (I.getCalledFunction() == nullptr) {
+      // Was function pointer, where we can not get the called function
+      if (pta == PTAType::BySignature) {
+        const auto& possibleFuncs = signatureFunctionMap[I.getFunctionType()];
+        for (const auto& func : possibleFuncs) {
+          assert(func);
+          auto& childNode = getOrInsertNode(func);
+          insertEdge(currentNode, childNode);
+        }
+      }
+    }
+  }
+
+  void visitFunction(llvm::Function& F) {
+    if (F.isIntrinsic())
+      return;
+
+    auto& currentNode = getOrInsertNode(&F);
+
+    auto* lcgNode = lcg->operator[](&F);
+    for (auto& [key, elem] : *lcgNode) {
+      if (!key.has_value())
+        continue;
+      if (elem->getFunction() == nullptr)
+        continue;
+      if (elem->getFunction()->isIntrinsic())
+        continue;
+      const Function* childFunc = elem->getFunction();
+      assert(childFunc->hasName());
+      metacg::CgNode& childNode = getOrInsertNode(childFunc);
+      insertEdge(currentNode, childNode);
+    }
+  }
+
+  std::unique_ptr<metacg::Callgraph> takeResult() { return std::move(mcg); }
+
+ private:
+  size_t addVirtualCallTargets(CallBase& I, const metacg::CgNode& currentNode) {
+    // TODO: Improve this design if we want to support multiple virtual call resolution mechanisms, e.g. with
+    //       template policy parameter.
+#ifdef HAVE_METAVIRT
+    auto vcallData = metavirt::vcall_data_for(&I);
+    if (!vcallData.has_value())
+      return 0;
+    if (vcallData.value().call_targets.empty())
+      return 0;
+
+    for (const auto& dataPoints : metavirt::fn_names_and_origins(vcallData.value())) {
+      auto& childNode = mcg->getOrInsertNode(dataPoints.name.str(), dataPoints.origin.str());
+      insertEdge(currentNode, childNode);
+      assert(childNode.getOrigin() == dataPoints.origin);
+    }
+    return metavirt::fn_names_and_origins(vcallData.value()).size();
+#else
+    return 0;
+#endif
+  }
+
+  metacg::CgNode& getOrInsertNode(const llvm::Function* F) {
+    bool hasBody = !F->isDeclaration();
+    StringRef nameToUse = F->getName();
+    std::optional<std::string> origin{};
+    if (metaDataAvail && functionInfoMap[F] != nullptr) {
+      auto linkageName = functionInfoMap[F]->getLinkageName();
+      if (!linkageName.empty()) {
+        nameToUse = linkageName;
+      }
+      origin = functionInfoMap[F]->getFilename().str();
+    }
+    return mcg->getOrInsertNode(nameToUse.str(), std::move(origin), false, hasBody);
+  }
+
+  bool insertEdge(const metacg::CgNode& a, const metacg::CgNode& b) {
+    if (mcg->existsEdge(a, b)) {
+      return false;
+    }
+    mcg->addEdge(a, b);
+    return true;
+  }
+
+  std::unique_ptr<metacg::Callgraph> mcg;
+  llvm::CallGraph* lcg;
+  PTAType pta;
+  bool metaDataAvail = false;
+  std::unordered_map<const Function*, const llvm::DISubprogram*> functionInfoMap;
+  std::unordered_map<llvm::FunctionType*, std::vector<const Function*>> signatureFunctionMap;
+};
+
+bool Generator::run(Module& M, ModuleAnalysisManager* MA) {
+  {
+    auto& cgResult = MA->getResult<CallGraphAnalysis>(M);
+    auto cbv = CallBaseVisitor(&cgResult, ptaType);
+    cbv.visit(M);
+
+    // Take resulting metacg call graph
+    auto mcg = cbv.takeResult();
+
+    // Run registered consumers
+    for (auto& consumer : consumers) {
+      consumer->consumeCallGraph(*mcg);
+    }
+  }
+  return false;
+}
+}  // namespace cage
diff --git a/tools/cage/src/generator/FileExporter.cpp b/tools/cage/src/generator/FileExporter.cpp
new file mode 100644
index 00000000..e598cf2e
--- /dev/null
+++ b/tools/cage/src/generator/FileExporter.cpp
@@ -0,0 +1,28 @@
+/**
+ * File: FileExporter.cpp
+ * License: Part of the MetaCG project. Licensed under BSD 3 clause license. See LICENSE.txt file at
+ * https://github.com/tudasc/metacg/LICENSE.txt
+ */
+#include "cage/generator/FileExporter.h"
+
+#include "llvm/Support/raw_ostream.h"
+
+#include "config.h"
+#include "io/MCGWriter.h"
+#include "io/VersionFourMCGWriter.h"
+
+namespace cage {
+
+void FileExporter::consumeCallGraph(metacg::Callgraph& graph) {
+  metacg::io::JsonSink jsSink;
+  metacg::io::VersionFourMCGWriter mcgw({{4, 0}, {"CaGe", 0, 1, MetaCG_GIT_SHA}}, true, true);
+  mcgw.write(&graph, jsSink);
+
+  llvm::outs() << "Writing generated call graph to: " << outfile << "\n";
+  std::ofstream out(outfile);
+  out << jsSink.getJson().dump(4);
+  out.flush();
+  out.close();
+}
+
+}  // namespace cage
diff --git a/tools/cage/test/CMakeLists.txt b/tools/cage/test/CMakeLists.txt
new file mode 100644
index 00000000..7d6186d9
--- /dev/null
+++ b/tools/cage/test/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(METACG_CONFIG "${CMAKE_BINARY_DIR}/utils/config/metacg-build-config")
+set(TEST_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+
+configure_file(
+  runCaGeTests.sh.in
+  ${CMAKE_CURRENT_BINARY_DIR}/runCaGeTests.sh
+  @ONLY
+)
diff --git a/tools/cage/test/input/ctorDtor/0001.cpp b/tools/cage/test/input/ctorDtor/0001.cpp
new file mode 100644
index 00000000..a3df49ee
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0001.cpp
@@ -0,0 +1,13 @@
+// call to constructor and virtual destructor
+
+class MyClass {
+ public:
+  MyClass() {}
+  virtual ~MyClass() {}
+};
+
+int main(int argc, char* argv[]) {
+  MyClass mc;
+
+  return 0;
+}
diff --git a/tools/cage/test/input/ctorDtor/0001.gtmcg b/tools/cage/test/input/ctorDtor/0001.gtmcg
new file mode 100644
index 00000000..82bd287a
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0001.gtmcg
@@ -0,0 +1,208 @@
+{
+    "_CG": {
+        "_ZN7MyClassC1Ev": {
+            "callees": [],
+            "callers": [
+                "main"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0001.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN7MyClassC2Ev": {
+            "callees": [],
+            "callers": [
+                "main"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0001.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN7MyClassD0Ev": {
+            "callees": [],
+            "callers": [
+                "main"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": true,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0001.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN7MyClassD1Ev": {
+            "callees": [],
+            "callers": [
+                "main"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": true,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0001.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN7MyClassD2Ev": {
+            "callees": [],
+            "callers": [
+                "main"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": true,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0001.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "main": {
+            "callees": [
+                "_ZN7MyClassC1Ev",
+                "_ZN7MyClassC2Ev",
+                "_ZN7MyClassD0Ev",
+                "_ZN7MyClassD1Ev",
+                "_ZN7MyClassD2Ev"
+            ],
+            "callers": [],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 3
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0001.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 3,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 2
+            },
+            "overriddenBy": [],
+            "overrides": []
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CGCollector",
+            "sha": "fb0a2854b64e5ac27c0a2e8b3e2c1b413e79ab6d",
+            "version": "0.2"
+        },
+        "version": "2.0"
+    }
+}
diff --git a/tools/cage/test/input/ctorDtor/0002.cpp b/tools/cage/test/input/ctorDtor/0002.cpp
new file mode 100644
index 00000000..727ac61c
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0002.cpp
@@ -0,0 +1,7 @@
+struct Base {};
+
+int main(int argc, char** argv) {
+  Base* bp = new Base();
+  delete bp;
+  return 0;
+}
diff --git a/tools/cage/test/input/ctorDtor/0002.gtmcg b/tools/cage/test/input/ctorDtor/0002.gtmcg
new file mode 100644
index 00000000..21668260
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0002.gtmcg
@@ -0,0 +1,175 @@
+{
+    "_CG": {
+        "_ZN4BaseC1Ev": {
+            "callees": [],
+            "callers": [
+                "main"
+            ],
+            "doesOverride": false,
+            "hasBody": false,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0002.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN4BaseC2Ev": {
+            "callees": [],
+            "callers": [
+                "main"
+            ],
+            "doesOverride": false,
+            "hasBody": false,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0002.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN4BaseD1Ev": {
+            "callees": [],
+            "callers": [
+                "main"
+            ],
+            "doesOverride": false,
+            "hasBody": false,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0002.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN4BaseD2Ev": {
+            "callees": [],
+            "callers": [
+                "main"
+            ],
+            "doesOverride": false,
+            "hasBody": false,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0002.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "main": {
+            "callees": [
+                "_ZN4BaseC1Ev",
+                "_ZN4BaseC2Ev",
+                "_ZN4BaseD1Ev",
+                "_ZN4BaseD2Ev"
+            ],
+            "callers": [],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 3
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0002.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 6,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 1,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 3
+            },
+            "overriddenBy": [],
+            "overrides": []
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CGCollector",
+            "sha": "fb0a2854b64e5ac27c0a2e8b3e2c1b413e79ab6d",
+            "version": "0.2"
+        },
+        "version": "2.0"
+    }
+}
diff --git a/tools/cage/test/input/ctorDtor/0003.cpp b/tools/cage/test/input/ctorDtor/0003.cpp
new file mode 100644
index 00000000..bcda4ddc
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0003.cpp
@@ -0,0 +1,15 @@
+// Member b of A is default-initialized, this must be caught by cgcollector.
+// This will lead to a callpath existing from A() through B() to hidden()
+
+void hidden() {}
+
+struct B {
+  int* data;
+  B() { hidden(); }
+};
+
+struct A {
+  A() {}
+
+  B b;
+};
\ No newline at end of file
diff --git a/tools/cage/test/input/ctorDtor/0003.gtmcg b/tools/cage/test/input/ctorDtor/0003.gtmcg
new file mode 100644
index 00000000..0c4c822d
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0003.gtmcg
@@ -0,0 +1,249 @@
+{
+    "_CG": {
+        "_Z6hiddenv": {
+            "callees": [],
+            "callers": [
+                "_ZN1BC1Ev",
+                "_ZN1BC2Ev"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0003.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": false,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1AC1Ev": {
+            "callees": [
+                "_ZN1BC1Ev",
+                "_ZN1BC2Ev"
+            ],
+            "callers": [],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0003.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1AC2Ev": {
+            "callees": [
+                "_ZN1BC1Ev",
+                "_ZN1BC2Ev"
+            ],
+            "callers": [],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0003.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BC1Ev": {
+            "callees": [
+                "_Z6hiddenv"
+            ],
+            "callers": [
+                "_ZN1AC1Ev",
+                "_ZN1AC2Ev"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {
+                        "_Z6hiddenv": [
+                            [
+                                1.0,
+                                ""
+                            ]
+                        ]
+                    },
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0003.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {
+                    "_Z6hiddenv": 0
+                },
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 1,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 1
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BC2Ev": {
+            "callees": [
+                "_Z6hiddenv"
+            ],
+            "callers": [
+                "_ZN1AC1Ev",
+                "_ZN1AC2Ev"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {
+                        "_Z6hiddenv": [
+                            [
+                                1.0,
+                                ""
+                            ]
+                        ]
+                    },
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0003.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {
+                    "_Z6hiddenv": 0
+                },
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 1,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 1
+            },
+            "overriddenBy": [],
+            "overrides": []
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CGCollector",
+            "sha": "de5748d537c1e79cf1ea786deeb1830c325a5ad3",
+            "version": "0.7"
+        },
+        "version": "2.0"
+    }
+}
diff --git a/tools/cage/test/input/ctorDtor/0004.cpp b/tools/cage/test/input/ctorDtor/0004.cpp
new file mode 100644
index 00000000..d3b15bfe
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0004.cpp
@@ -0,0 +1,14 @@
+// The destructor ~A() should appear an (implicit) callee of ~B().
+
+struct A {
+  ~A() {}
+};
+
+struct B : A {
+  ~B() {};
+};
+
+void foo() {
+  B* b = new B;
+  delete b;
+}
diff --git a/tools/cage/test/input/ctorDtor/0004.gtmcg b/tools/cage/test/input/ctorDtor/0004.gtmcg
new file mode 100644
index 00000000..bfb027cd
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0004.gtmcg
@@ -0,0 +1,317 @@
+{
+    "_CG": {
+        "_Z3foov": {
+            "callees": [
+                "_ZN1BC1Ev",
+                "_ZN1BC2Ev",
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "callers": [],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 1
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0004.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": false,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 5,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 1,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 2
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1AD1Ev": {
+            "callees": [],
+            "callers": [
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0004.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1AD2Ev": {
+            "callees": [],
+            "callers": [
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0004.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BC1Ev": {
+            "callees": [],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0004.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": true
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BC2Ev": {
+            "callees": [],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0004.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": true
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BD1Ev": {
+            "callees": [
+                "_ZN1AD1Ev",
+                "_ZN1AD2Ev"
+            ],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0004.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BD2Ev": {
+            "callees": [
+                "_ZN1AD1Ev",
+                "_ZN1AD2Ev"
+            ],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0004.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CGCollector",
+            "sha": "de5748d537c1e79cf1ea786deeb1830c325a5ad3",
+            "version": "0.7"
+        },
+        "version": "2.0"
+    }
+}
diff --git a/tools/cage/test/input/ctorDtor/0005.cpp b/tools/cage/test/input/ctorDtor/0005.cpp
new file mode 100644
index 00000000..873c791c
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0005.cpp
@@ -0,0 +1,11 @@
+// Tests if the destruction of local variables is properly captured.
+
+struct A {
+  ~A() {}
+};
+
+struct B : A {
+  ~B() {};
+};
+
+void foo() { B b; }
diff --git a/tools/cage/test/input/ctorDtor/0005.gtmcg b/tools/cage/test/input/ctorDtor/0005.gtmcg
new file mode 100644
index 00000000..eb7bf277
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0005.gtmcg
@@ -0,0 +1,317 @@
+{
+    "_CG": {
+        "_Z3foov": {
+            "callees": [
+                "_ZN1BC1Ev",
+                "_ZN1BC2Ev",
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "callers": [],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 1
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0005.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": false,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 2,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 1
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1AD1Ev": {
+            "callees": [],
+            "callers": [
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0005.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1AD2Ev": {
+            "callees": [],
+            "callers": [
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0005.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BC1Ev": {
+            "callees": [],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0005.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": true
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BC2Ev": {
+            "callees": [],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0005.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": true
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BD1Ev": {
+            "callees": [
+                "_ZN1AD1Ev",
+                "_ZN1AD2Ev"
+            ],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0005.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BD2Ev": {
+            "callees": [
+                "_ZN1AD1Ev",
+                "_ZN1AD2Ev"
+            ],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0005.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CGCollector",
+            "sha": "de5748d537c1e79cf1ea786deeb1830c325a5ad3",
+            "version": "0.7"
+        },
+        "version": "2.0"
+    }
+}
diff --git a/tools/cage/test/input/ctorDtor/0006.cpp b/tools/cage/test/input/ctorDtor/0006.cpp
new file mode 100644
index 00000000..aff22ca6
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0006.cpp
@@ -0,0 +1,13 @@
+// Tests if the destruction of temporary local variables is properly captured.
+
+struct A {
+  ~A() {}
+};
+
+struct B : A {
+  ~B() {};
+};
+
+B makeB() { return B(); }
+
+void foo() { makeB(); }
diff --git a/tools/cage/test/input/ctorDtor/0006.gtmcg b/tools/cage/test/input/ctorDtor/0006.gtmcg
new file mode 100644
index 00000000..476f9382
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0006.gtmcg
@@ -0,0 +1,374 @@
+{
+    "_CG": {
+        "_Z3foov": {
+            "callees": [
+                "_Z5makeBv",
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "callers": [],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {
+                        "_Z5makeBv": [
+                            [
+                                1.0,
+                                ""
+                            ]
+                        ]
+                    },
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0006.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": false,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {
+                    "_Z5makeBv": 0
+                },
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 1,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 1
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_Z5makeBv": {
+            "callees": [
+                "_ZN1BC1Ev",
+                "_ZN1BC2Ev",
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0006.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": false,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 5,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 1
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1AD1Ev": {
+            "callees": [],
+            "callers": [
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0006.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1AD2Ev": {
+            "callees": [],
+            "callers": [
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0006.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BC1Ev": {
+            "callees": [],
+            "callers": [
+                "_Z5makeBv"
+            ],
+            "doesOverride": false,
+            "hasBody": false,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0006.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": true
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BC2Ev": {
+            "callees": [],
+            "callers": [
+                "_Z5makeBv"
+            ],
+            "doesOverride": false,
+            "hasBody": false,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0006.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": true
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BD1Ev": {
+            "callees": [
+                "_ZN1AD1Ev",
+                "_ZN1AD2Ev"
+            ],
+            "callers": [
+                "_Z3foov",
+                "_Z5makeBv"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0006.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BD2Ev": {
+            "callees": [
+                "_ZN1AD1Ev",
+                "_ZN1AD2Ev"
+            ],
+            "callers": [
+                "_Z3foov",
+                "_Z5makeBv"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0006.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CGCollector",
+            "sha": "de5748d537c1e79cf1ea786deeb1830c325a5ad3",
+            "version": "0.7"
+        },
+        "version": "2.0"
+    }
+}
diff --git a/tools/cage/test/input/ctorDtor/0007.cpp b/tools/cage/test/input/ctorDtor/0007.cpp
new file mode 100644
index 00000000..fe6d3c46
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0007.cpp
@@ -0,0 +1,15 @@
+// Tests if non-virtual destructors are handled correctly.
+
+struct A {
+  ~A() {}
+};
+
+struct B : A {
+  ~B() {};
+};
+
+void foo() {
+  A* b = new B;
+  // This should only call the destructor of A
+  delete b;
+}
diff --git a/tools/cage/test/input/ctorDtor/0007.gtmcg b/tools/cage/test/input/ctorDtor/0007.gtmcg
new file mode 100644
index 00000000..cba016bf
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0007.gtmcg
@@ -0,0 +1,315 @@
+{
+    "_CG": {
+        "_Z3foov": {
+            "callees": [
+                "_ZN1AD1Ev",
+                "_ZN1AD2Ev",
+                "_ZN1BC1Ev",
+                "_ZN1BC2Ev"
+            ],
+            "callers": [],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 1
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0007.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": false,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 5,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 1,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 2
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1AD1Ev": {
+            "callees": [],
+            "callers": [
+                "_Z3foov",
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0007.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1AD2Ev": {
+            "callees": [],
+            "callers": [
+                "_Z3foov",
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0007.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BC1Ev": {
+            "callees": [],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0007.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": true
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BC2Ev": {
+            "callees": [],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0007.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": true
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BD1Ev": {
+            "callees": [
+                "_ZN1AD1Ev",
+                "_ZN1AD2Ev"
+            ],
+            "callers": [],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0007.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BD2Ev": {
+            "callees": [
+                "_ZN1AD1Ev",
+                "_ZN1AD2Ev"
+            ],
+            "callers": [],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0007.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CGCollector",
+            "sha": "de5748d537c1e79cf1ea786deeb1830c325a5ad3",
+            "version": "0.7"
+        },
+        "version": "2.0"
+    }
+}
diff --git a/tools/cage/test/input/ctorDtor/0008.cpp b/tools/cage/test/input/ctorDtor/0008.cpp
new file mode 100644
index 00000000..c36fa09a
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0008.cpp
@@ -0,0 +1,16 @@
+// Tests if implicit destruction of member variables is properly captured.
+
+struct A {
+  ~A() {}
+};
+
+struct B {
+  // ~A() should be called here.
+  ~B() {};
+  A a;
+};
+
+void foo() {
+  B* b = new B;
+  delete b;
+}
diff --git a/tools/cage/test/input/ctorDtor/0008.gtmcg b/tools/cage/test/input/ctorDtor/0008.gtmcg
new file mode 100644
index 00000000..7d560f0c
--- /dev/null
+++ b/tools/cage/test/input/ctorDtor/0008.gtmcg
@@ -0,0 +1,317 @@
+{
+    "_CG": {
+        "_Z3foov": {
+            "callees": [
+                "_ZN1BC1Ev",
+                "_ZN1BC2Ev",
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "callers": [],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 1
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0008.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": false,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 5,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 1,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 2
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1AD1Ev": {
+            "callees": [],
+            "callers": [
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0008.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1AD2Ev": {
+            "callees": [],
+            "callers": [
+                "_ZN1BD1Ev",
+                "_ZN1BD2Ev"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0008.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BC1Ev": {
+            "callees": [],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0008.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": true
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BC2Ev": {
+            "callees": [],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0008.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": true
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BD1Ev": {
+            "callees": [
+                "_ZN1AD1Ev",
+                "_ZN1AD2Ev"
+            ],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0008.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        },
+        "_ZN1BD2Ev": {
+            "callees": [
+                "_ZN1AD1Ev",
+                "_ZN1AD2Ev"
+            ],
+            "callers": [
+                "_Z3foov"
+            ],
+            "doesOverride": false,
+            "hasBody": true,
+            "isVirtual": false,
+            "meta": {
+                "codeStatistics": {
+                    "numVars": 0
+                },
+                "estimateCallCount": {
+                    "calls": {},
+                    "codeRegions": {}
+                },
+                "fileProperties": {
+                    "origin": "/opt/metacg/mcg-local/cgcollector/test/input/allCtorDtor/0008.cpp",
+                    "systemInclude": false
+                },
+                "globalLoopDepth": 0,
+                "inlineInfo": {
+                    "isTemplate": false,
+                    "likelyInline": true,
+                    "markedAlwaysInline": false,
+                    "markedInline": false
+                },
+                "loopCallDepth": {},
+                "loopDepth": 0,
+                "mallocCollector": [],
+                "numConditionalBranches": 0,
+                "numOperations": {
+                    "numberOfControlFlowOps": 0,
+                    "numberOfFloatOps": 0,
+                    "numberOfIntOps": 0,
+                    "numberOfMemoryAccesses": 0
+                },
+                "numStatements": 0
+            },
+            "overriddenBy": [],
+            "overrides": []
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CGCollector",
+            "sha": "de5748d537c1e79cf1ea786deeb1830c325a5ad3",
+            "version": "0.7"
+        },
+        "version": "2.0"
+    }
+}
diff --git a/tools/cage/test/input/multiTU/0042.gtmcg b/tools/cage/test/input/multiTU/0042.gtmcg
new file mode 100644
index 00000000..0a10eabc
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0042.gtmcg
@@ -0,0 +1,54 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3barv": {
+                "callees": {
+                    "_Z3boov": {}
+                },
+                "functionName": "_Z3barv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0042_b.cpp"
+            },
+            "_Z3bazv": {
+                "callees": {
+                    "_Z3foov": {}
+                },
+                "functionName": "_Z3bazv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0042_a.cpp"
+            },
+            "_Z3boov": {
+                "callees": {},
+                "functionName": "_Z3boov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0042_b.cpp"
+            },
+            "_Z3foov": {
+                "callees": {},
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0042_a.cpp"
+            },
+            "main": {
+                "callees": {},
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0042_a.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/multiTU/0042_a.cpp b/tools/cage/test/input/multiTU/0042_a.cpp
new file mode 100644
index 00000000..1219c918
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0042_a.cpp
@@ -0,0 +1,5 @@
+__attribute__((retain)) int foo() { return 42; }
+
+__attribute__((retain)) int baz() { return foo(); }
+
+int main() { return 0; }
\ No newline at end of file
diff --git a/tools/cage/test/input/multiTU/0042_b.cpp b/tools/cage/test/input/multiTU/0042_b.cpp
new file mode 100644
index 00000000..a618e12b
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0042_b.cpp
@@ -0,0 +1,7 @@
+__attribute__((retain)) int boo() {
+  int a = 1;
+  int b = 0;
+  return a + b;
+}
+
+__attribute__((retain)) int bar() { return boo(); }
diff --git a/tools/cage/test/input/multiTU/0043.gtmcg b/tools/cage/test/input/multiTU/0043.gtmcg
new file mode 100644
index 00000000..15d0c6ae
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0043.gtmcg
@@ -0,0 +1,52 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3barv": {
+                "callees": {},
+                "functionName": "_Z3barv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0043_a.cpp"
+            },
+            "_Z3foov": {
+                "callees": {},
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0043_a.cpp"
+            },
+            "_Z3goov": {
+                "callees": {
+                    "_Z3barv": {}
+                },
+                "functionName": "_Z3goov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0043_b.cpp"
+            },
+            "_Z3harv": {
+                "callees": {},
+                "functionName": "_Z3harv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0043_b.cpp"
+            },
+            "main": {
+                "callees": {},
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0043_a.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/multiTU/0043_a.cpp b/tools/cage/test/input/multiTU/0043_a.cpp
new file mode 100644
index 00000000..c4e589f4
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0043_a.cpp
@@ -0,0 +1,5 @@
+__attribute__((retain)) int foo() { return 1; }
+
+__attribute__((retain)) int bar() { return 2; }
+
+int main() { return 0; }
diff --git a/tools/cage/test/input/multiTU/0043_b.cpp b/tools/cage/test/input/multiTU/0043_b.cpp
new file mode 100644
index 00000000..5b521808
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0043_b.cpp
@@ -0,0 +1,5 @@
+extern int bar();
+
+__attribute__((retain)) int har() { return 4; }
+
+__attribute__((retain)) int goo() { return bar(); }
diff --git a/tools/cage/test/input/multiTU/0044.gtmcg b/tools/cage/test/input/multiTU/0044.gtmcg
new file mode 100644
index 00000000..3fe414e4
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0044.gtmcg
@@ -0,0 +1,56 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z2hfv": {
+                "callees": {
+                    "_Z3foov": {}
+                },
+                "functionName": "_Z2hfv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0044_b.cpp"
+            },
+            "_Z3barv": {
+                "callees": {
+                    "_Z3foov": {}
+                },
+                "functionName": "_Z3barv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0044_a.cpp"
+            },
+            "_Z3foov": {
+                "callees": {},
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0044_b.cpp"
+            },
+            "_Z3harv": {
+                "callees": {
+                    "_Z3barv": {}
+                },
+                "functionName": "_Z3harv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0044_a.cpp"
+            },
+            "main": {
+                "callees": {},
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0044_a.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/multiTU/0044_a.cpp b/tools/cage/test/input/multiTU/0044_a.cpp
new file mode 100644
index 00000000..d4c995be
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0044_a.cpp
@@ -0,0 +1,7 @@
+extern int foo();
+
+int bar() { return foo(); }
+
+__attribute__((retain)) int har() { return bar(); }
+
+int main() { return 0; }
\ No newline at end of file
diff --git a/tools/cage/test/input/multiTU/0044_b.cpp b/tools/cage/test/input/multiTU/0044_b.cpp
new file mode 100644
index 00000000..610fd28f
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0044_b.cpp
@@ -0,0 +1,3 @@
+int foo() { return 2; }
+
+__attribute__((retain)) int hf() { return foo(); }
diff --git a/tools/cage/test/input/multiTU/0050.gtmcg b/tools/cage/test/input/multiTU/0050.gtmcg
new file mode 100644
index 00000000..3da2aa08
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0050.gtmcg
@@ -0,0 +1,64 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN4Base3fooEv": {
+                "callees": {},
+                "functionName": "_ZN4Base3fooEv",
+                "hasBody": false,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0050.h"
+            },
+            "_ZN4BaseC2Ev": {
+                "callees": {},
+                "functionName": "_ZN4BaseC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0050.h"
+            },
+            "_ZN6Derive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN6Derive3fooEv",
+                "hasBody": false,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0050.h"
+            },
+            "_ZN6DeriveC2Ev": {
+                "callees": {
+                    "_ZN4BaseC2Ev": {}
+                },
+                "functionName": "_ZN6DeriveC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0050.h"
+            },
+            "_Znwm": {
+                "callees": {},
+                "functionName": "_Znwm",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "main": {
+                "callees": {
+                    "_ZN4Base3fooEv": {},
+                    "_ZN6Derive3fooEv": {},
+                    "_ZN6DeriveC2Ev": {},
+                    "_Znwm": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0050_a.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/multiTU/0050.h b/tools/cage/test/input/multiTU/0050.h
new file mode 100644
index 00000000..80b8a9f9
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0050.h
@@ -0,0 +1,8 @@
+
+struct Base {
+  virtual void foo() {}
+};
+
+struct Derive : public Base {
+  virtual void foo() override {}
+};
diff --git a/tools/cage/test/input/multiTU/0050_a.cpp b/tools/cage/test/input/multiTU/0050_a.cpp
new file mode 100644
index 00000000..9262b855
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0050_a.cpp
@@ -0,0 +1,11 @@
+#include "0050.h"
+
+struct DeriveTwo : public Base {
+  virtual void foo() override {}
+};
+
+int main() {
+  Base* b = new Derive;
+  b->foo();
+  return 0;
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/multiTU/0050_b.cpp b/tools/cage/test/input/multiTU/0050_b.cpp
new file mode 100644
index 00000000..01b0edab
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0050_b.cpp
@@ -0,0 +1,5 @@
+#include "0050.h"
+
+struct DeriveDerive : public Derive {
+  virtual void foo() override {}
+};
diff --git a/tools/cage/test/input/multiTU/0053.gtmcg b/tools/cage/test/input/multiTU/0053.gtmcg
new file mode 100644
index 00000000..7c7c6def
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0053.gtmcg
@@ -0,0 +1,87 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN13MyClassDerive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0053.h"
+            },
+            "_ZN13MyClassDeriveC2Ev": {
+                "callees": {
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "_ZN13MyClassDeriveC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0053.h"
+            },
+            "_ZN14MyClassDeriveD3fooEv": {
+                "callees": {},
+                "functionName": "_ZN14MyClassDeriveD3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0053_b.cpp"
+            },
+            "_ZN14MyClassDeriveDC2Ev": {
+                "callees": {
+                    "_ZN13MyClassDeriveC2Ev": {}
+                },
+                "functionName": "_ZN14MyClassDeriveDC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0053_b.cpp"
+            },
+            "_ZN7MyClass3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7MyClass3fooEv",
+                "hasBody": false,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0053.h"
+            },
+            "_ZN7MyClassC2Ev": {
+                "callees": {},
+                "functionName": "_ZN7MyClassC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0053.h"
+            },
+            "_Znwm": {
+                "callees": {},
+                "functionName": "_Znwm",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "__cxa_pure_virtual": {
+                "callees": {},
+                "functionName": "__cxa_pure_virtual",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "main": {
+                "callees": {
+                    "_ZN13MyClassDerive3fooEv": {},
+                    "_ZN14MyClassDeriveDC2Ev": {},
+                    "_ZN7MyClass3fooEv": {},
+                    "_Znwm": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0053_b.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/multiTU/0053.h b/tools/cage/test/input/multiTU/0053.h
new file mode 100644
index 00000000..2f4dbded
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0053.h
@@ -0,0 +1,10 @@
+
+class MyClass {
+ public:
+  virtual int foo() = 0;
+};
+
+class MyClassDerive : public MyClass {
+ public:
+  virtual int foo();
+};
diff --git a/tools/cage/test/input/multiTU/0053_a.cpp b/tools/cage/test/input/multiTU/0053_a.cpp
new file mode 100644
index 00000000..817bffd4
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0053_a.cpp
@@ -0,0 +1,3 @@
+#include "0053.h"
+
+int MyClassDerive::foo() { return 42; }
diff --git a/tools/cage/test/input/multiTU/0053_b.cpp b/tools/cage/test/input/multiTU/0053_b.cpp
new file mode 100644
index 00000000..f5aa55a3
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0053_b.cpp
@@ -0,0 +1,15 @@
+// call to redefining function
+
+#include "0053.h"
+
+class MyClassDeriveD : public MyClassDerive {
+ public:
+  int foo() { return 1; }
+};
+
+int main(int argc, char* argv[]) {
+  MyClass* m = new MyClassDeriveD();
+  m->foo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/multiTU/0060.gtmcg b/tools/cage/test/input/multiTU/0060.gtmcg
new file mode 100644
index 00000000..44ad1a71
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0060.gtmcg
@@ -0,0 +1,78 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z1xv": {
+                "callees": {
+                    "_Z4leafv": {},
+                    "_Z4loopv": {}
+                },
+                "functionName": "_Z1xv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0060_a.cpp"
+            },
+            "_Z4leafv": {
+                "callees": {},
+                "functionName": "_Z4leafv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0060_a.cpp"
+            },
+            "_Z4leftv": {
+                "callees": {
+                    "_Z1xv": {}
+                },
+                "functionName": "_Z4leftv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0060_a.cpp"
+            },
+            "_Z4loopv": {
+                "callees": {
+                    "_Z5splitv": {}
+                },
+                "functionName": "_Z4loopv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0060_b.cpp"
+            },
+            "_Z5rightv": {
+                "callees": {
+                    "_Z1xv": {}
+                },
+                "functionName": "_Z5rightv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0060_a.cpp"
+            },
+            "_Z5splitv": {
+                "callees": {
+                    "_Z4leftv": {},
+                    "_Z5rightv": {}
+                },
+                "functionName": "_Z5splitv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0060_a.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z5splitv": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/multiTU/0060_a.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/multiTU/0060_a.cpp b/tools/cage/test/input/multiTU/0060_a.cpp
new file mode 100644
index 00000000..0df094e3
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0060_a.cpp
@@ -0,0 +1,50 @@
+void leaf() {
+  while (true) {
+    break;
+  }
+}
+
+void loop();
+
+void x() {
+  leaf();
+  loop();
+}
+
+void left() {
+  while (true) {
+    x();
+    break;
+  }
+}
+
+void right() {
+  while (true) {
+    while (true) {
+      x();
+      break;
+    }
+    break;
+  }
+}
+
+void split() {
+  left();
+  right();
+}
+
+void entry() {
+  while (true) {
+    while (true) {
+      left();
+      entry();
+      break;
+    }
+    break;
+  }
+}
+
+int main() {
+  split();
+  return 0;
+}
diff --git a/tools/cage/test/input/multiTU/0060_b.cpp b/tools/cage/test/input/multiTU/0060_b.cpp
new file mode 100644
index 00000000..9f66928f
--- /dev/null
+++ b/tools/cage/test/input/multiTU/0060_b.cpp
@@ -0,0 +1,8 @@
+void split();
+
+void loop() {
+  while (true) {
+    split();
+    break;
+  }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0001.cpp b/tools/cage/test/input/singleTU/0001.cpp
new file mode 100644
index 00000000..8e13b917
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0001.cpp
@@ -0,0 +1,3 @@
+// no calls at all
+
+int main(int argc, char* argv[]) { return 0; }
diff --git a/tools/cage/test/input/singleTU/0001.gtmcg b/tools/cage/test/input/singleTU/0001.gtmcg
new file mode 100644
index 00000000..5f741a3d
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0001.gtmcg
@@ -0,0 +1,22 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "main": {
+                "callees": {},
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0001.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0001.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0001.pta-signature.gtmcg
new file mode 100644
index 00000000..5f741a3d
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0001.pta-signature.gtmcg
@@ -0,0 +1,22 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "main": {
+                "callees": {},
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0001.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0002.cpp b/tools/cage/test/input/singleTU/0002.cpp
new file mode 100644
index 00000000..6ad0a08d
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0002.cpp
@@ -0,0 +1,8 @@
+// one call to foo
+
+void foo() {}
+
+int main(int argc, char* argv[]) {
+  foo();
+  return 0;
+}
diff --git a/tools/cage/test/input/singleTU/0002.gtmcg b/tools/cage/test/input/singleTU/0002.gtmcg
new file mode 100644
index 00000000..dcf5b02d
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0002.gtmcg
@@ -0,0 +1,31 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3foov": {
+                "callees": {},
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0002.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z3foov": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0002.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0002.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0002.pta-signature.gtmcg
new file mode 100644
index 00000000..dcf5b02d
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0002.pta-signature.gtmcg
@@ -0,0 +1,31 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3foov": {
+                "callees": {},
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0002.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z3foov": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0002.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0003.cpp b/tools/cage/test/input/singleTU/0003.cpp
new file mode 100644
index 00000000..c226eab9
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0003.cpp
@@ -0,0 +1,10 @@
+// main -> foo -> bar
+
+int bar() { return 42; }
+
+int foo() { return bar(); }
+
+int main(int argc, char* argv[]) {
+  foo();
+  return 0;
+}
diff --git a/tools/cage/test/input/singleTU/0003.gtmcg b/tools/cage/test/input/singleTU/0003.gtmcg
new file mode 100644
index 00000000..2d3323bd
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0003.gtmcg
@@ -0,0 +1,40 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3barv": {
+                "callees": {},
+                "functionName": "_Z3barv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0003.cpp"
+            },
+            "_Z3foov": {
+                "callees": {
+                    "_Z3barv": {}
+                },
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0003.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z3foov": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0003.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0003.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0003.pta-signature.gtmcg
new file mode 100644
index 00000000..2d3323bd
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0003.pta-signature.gtmcg
@@ -0,0 +1,40 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3barv": {
+                "callees": {},
+                "functionName": "_Z3barv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0003.cpp"
+            },
+            "_Z3foov": {
+                "callees": {
+                    "_Z3barv": {}
+                },
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0003.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z3foov": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0003.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0004.cpp b/tools/cage/test/input/singleTU/0004.cpp
new file mode 100644
index 00000000..22ad639e
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0004.cpp
@@ -0,0 +1,12 @@
+// no call
+// but a second function
+
+__attribute__((retain)) int foo() {
+  int a = 0;
+  for (int i = 0; i < 5; ++i) {
+    a += 2;
+  }
+  return a;
+}
+
+int main(int argc, char* argv[]) { return 0; }
diff --git a/tools/cage/test/input/singleTU/0004.gtmcg b/tools/cage/test/input/singleTU/0004.gtmcg
new file mode 100644
index 00000000..3c26fea6
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0004.gtmcg
@@ -0,0 +1,29 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3foov": {
+                "callees": {},
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0004.cpp"
+            },
+            "main": {
+                "callees": {},
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0004.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0004.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0004.pta-signature.gtmcg
new file mode 100644
index 00000000..3c26fea6
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0004.pta-signature.gtmcg
@@ -0,0 +1,29 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3foov": {
+                "callees": {},
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0004.cpp"
+            },
+            "main": {
+                "callees": {},
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0004.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0005.cpp b/tools/cage/test/input/singleTU/0005.cpp
new file mode 100644
index 00000000..0b96b936
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0005.cpp
@@ -0,0 +1,11 @@
+// two functions called independently from main
+
+void childOne() {}
+void childTwo() {}
+
+int main(int argc, char* argv[]) {
+  childOne();
+  childTwo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/singleTU/0005.gtmcg b/tools/cage/test/input/singleTU/0005.gtmcg
new file mode 100644
index 00000000..bf678f94
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0005.gtmcg
@@ -0,0 +1,39 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z8childOnev": {
+                "callees": {},
+                "functionName": "_Z8childOnev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0005.cpp"
+            },
+            "_Z8childTwov": {
+                "callees": {},
+                "functionName": "_Z8childTwov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0005.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z8childOnev": {},
+                    "_Z8childTwov": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0005.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0005.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0005.pta-signature.gtmcg
new file mode 100644
index 00000000..bf678f94
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0005.pta-signature.gtmcg
@@ -0,0 +1,39 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z8childOnev": {
+                "callees": {},
+                "functionName": "_Z8childOnev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0005.cpp"
+            },
+            "_Z8childTwov": {
+                "callees": {},
+                "functionName": "_Z8childTwov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0005.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z8childOnev": {},
+                    "_Z8childTwov": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0005.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0013.cpp b/tools/cage/test/input/singleTU/0013.cpp
new file mode 100644
index 00000000..331bf228
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0013.cpp
@@ -0,0 +1,12 @@
+// call to multiple functions
+
+int lastChild() { return 1; }
+
+int middle() { return lastChild(); }
+
+__attribute__((retain)) int middle2() { return lastChild(); }
+
+int main(int argc, char* argv[]) {
+  middle();
+  return 0;
+}
diff --git a/tools/cage/test/input/singleTU/0013.gtmcg b/tools/cage/test/input/singleTU/0013.gtmcg
new file mode 100644
index 00000000..ad831e83
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0013.gtmcg
@@ -0,0 +1,49 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z6middlev": {
+                "callees": {
+                    "_Z9lastChildv": {}
+                },
+                "functionName": "_Z6middlev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0013.cpp"
+            },
+            "_Z7middle2v": {
+                "callees": {
+                    "_Z9lastChildv": {}
+                },
+                "functionName": "_Z7middle2v",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0013.cpp"
+            },
+            "_Z9lastChildv": {
+                "callees": {},
+                "functionName": "_Z9lastChildv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0013.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z6middlev": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0013.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0013.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0013.pta-signature.gtmcg
new file mode 100644
index 00000000..ad831e83
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0013.pta-signature.gtmcg
@@ -0,0 +1,49 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z6middlev": {
+                "callees": {
+                    "_Z9lastChildv": {}
+                },
+                "functionName": "_Z6middlev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0013.cpp"
+            },
+            "_Z7middle2v": {
+                "callees": {
+                    "_Z9lastChildv": {}
+                },
+                "functionName": "_Z7middle2v",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0013.cpp"
+            },
+            "_Z9lastChildv": {
+                "callees": {},
+                "functionName": "_Z9lastChildv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0013.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z6middlev": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0013.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0014.cpp b/tools/cage/test/input/singleTU/0014.cpp
new file mode 100644
index 00000000..f62de2b2
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0014.cpp
@@ -0,0 +1,13 @@
+// call to multiple functions
+
+int lastChild() { return 1; }
+
+int middle2() { return lastChild(); }
+
+int middle() { return middle2(); }
+
+int main(int argc, char* argv[]) {
+  middle();
+  lastChild();
+  return 0;
+}
diff --git a/tools/cage/test/input/singleTU/0014.gtmcg b/tools/cage/test/input/singleTU/0014.gtmcg
new file mode 100644
index 00000000..9227bacb
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0014.gtmcg
@@ -0,0 +1,50 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z6middlev": {
+                "callees": {
+                    "_Z7middle2v": {}
+                },
+                "functionName": "_Z6middlev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0014.cpp"
+            },
+            "_Z7middle2v": {
+                "callees": {
+                    "_Z9lastChildv": {}
+                },
+                "functionName": "_Z7middle2v",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0014.cpp"
+            },
+            "_Z9lastChildv": {
+                "callees": {},
+                "functionName": "_Z9lastChildv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0014.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z6middlev": {},
+                    "_Z9lastChildv": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0014.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0014.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0014.pta-signature.gtmcg
new file mode 100644
index 00000000..9227bacb
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0014.pta-signature.gtmcg
@@ -0,0 +1,50 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z6middlev": {
+                "callees": {
+                    "_Z7middle2v": {}
+                },
+                "functionName": "_Z6middlev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0014.cpp"
+            },
+            "_Z7middle2v": {
+                "callees": {
+                    "_Z9lastChildv": {}
+                },
+                "functionName": "_Z7middle2v",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0014.cpp"
+            },
+            "_Z9lastChildv": {
+                "callees": {},
+                "functionName": "_Z9lastChildv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0014.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z6middlev": {},
+                    "_Z9lastChildv": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0014.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0065.cpp b/tools/cage/test/input/singleTU/0065.cpp
new file mode 100644
index 00000000..562ee0a3
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0065.cpp
@@ -0,0 +1,27 @@
+/**
+ * Function pointer test
+ */
+
+typedef void (*Fn)();
+
+void func1() {}
+
+void func2() {}
+
+Fn get_func_ptr(int i) {
+  if (i == 0) {
+    return func1;
+  } else {
+    return func2;
+  }
+}
+
+/**
+ * Main function
+ */
+int main(int argc, char** argv) {
+  // function pointer test
+  Fn func = get_func_ptr(0);
+  func();
+  return 0;
+}
diff --git a/tools/cage/test/input/singleTU/0065.gtmcg b/tools/cage/test/input/singleTU/0065.gtmcg
new file mode 100644
index 00000000..6f965c8e
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0065.gtmcg
@@ -0,0 +1,45 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z12get_func_ptri": {
+                "callees": {},
+                "functionName": "_Z12get_func_ptri",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0065.cpp"
+            },
+            "_Z5func1v": {
+                "callees": {},
+                "functionName": "_Z5func1v",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0065.cpp"
+            },
+            "_Z5func2v": {
+                "callees": {},
+                "functionName": "_Z5func2v",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0065.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z12get_func_ptri": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0065.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0065.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0065.pta-signature.gtmcg
new file mode 100644
index 00000000..9a16e16c
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0065.pta-signature.gtmcg
@@ -0,0 +1,47 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z12get_func_ptri": {
+                "callees": {},
+                "functionName": "_Z12get_func_ptri",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0065.cpp"
+            },
+            "_Z5func1v": {
+                "callees": {},
+                "functionName": "_Z5func1v",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0065.cpp"
+            },
+            "_Z5func2v": {
+                "callees": {},
+                "functionName": "_Z5func2v",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0065.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z12get_func_ptri": {},
+                    "_Z5func1v": {},
+                    "_Z5func2v": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0065.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0066.cpp b/tools/cage/test/input/singleTU/0066.cpp
new file mode 100644
index 00000000..8ca1c99e
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0066.cpp
@@ -0,0 +1,9 @@
+// Tests the handling of builtin functions
+void foo() {};
+
+int main() {
+  int x = 0;
+  if (__builtin_expect(x, 0))
+    foo();
+  return 0;
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0066.gtmcg b/tools/cage/test/input/singleTU/0066.gtmcg
new file mode 100644
index 00000000..7d6ebd13
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0066.gtmcg
@@ -0,0 +1,31 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3foov": {
+                "callees": {},
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0066.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z3foov": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0066.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0066.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0066.pta-signature.gtmcg
new file mode 100644
index 00000000..7d6ebd13
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0066.pta-signature.gtmcg
@@ -0,0 +1,31 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3foov": {
+                "callees": {},
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0066.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z3foov": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0066.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0230.cpp b/tools/cage/test/input/singleTU/0230.cpp
new file mode 100644
index 00000000..3b74e49f
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0230.cpp
@@ -0,0 +1,20 @@
+// Test for the handling of member functions and members that hold function pointers
+class A {
+ public:
+  void* member;
+  void* memberFunction() {
+    auto p = this;
+    return member;
+  }
+};
+
+void f() {}
+typedef void (*Fn)();
+
+int main() {
+  A a;
+  a.member = (void*)&f;
+  Fn b = (Fn)a.memberFunction();
+  b();
+  return 0;
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0230.gtmcg b/tools/cage/test/input/singleTU/0230.gtmcg
new file mode 100644
index 00000000..9fadcbba
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0230.gtmcg
@@ -0,0 +1,38 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z1fv": {
+                "callees": {},
+                "functionName": "_Z1fv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0230.cpp"
+            },
+            "_ZN1A14memberFunctionEv": {
+                "callees": {},
+                "functionName": "_ZN1A14memberFunctionEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0230.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN1A14memberFunctionEv": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0230.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0230.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0230.pta-signature.gtmcg
new file mode 100644
index 00000000..f0f9fdcf
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0230.pta-signature.gtmcg
@@ -0,0 +1,39 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z1fv": {
+                "callees": {},
+                "functionName": "_Z1fv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0230.cpp"
+            },
+            "_ZN1A14memberFunctionEv": {
+                "callees": {},
+                "functionName": "_ZN1A14memberFunctionEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0230.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z1fv": {},
+                    "_ZN1A14memberFunctionEv": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0230.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0232.cpp b/tools/cage/test/input/singleTU/0232.cpp
new file mode 100644
index 00000000..c7a0c0f3
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0232.cpp
@@ -0,0 +1,17 @@
+// Test for the handling of new and delete and calling function pointers within them.
+// The ground truth assumes that the pointer can be resolved.
+typedef void (*Fn)();
+
+void func1() {}
+
+class X {
+ public:
+  Fn function;
+  X(Fn arg) { function = arg; }
+  ~X() { function(); }
+};
+
+int main() {
+  const auto f = new X(func1);
+  delete f;
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0232.gtmcg b/tools/cage/test/input/singleTU/0232.gtmcg
new file mode 100644
index 00000000..1c4426c9
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0232.gtmcg
@@ -0,0 +1,62 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z5func1v": {
+                "callees": {},
+                "functionName": "_Z5func1v",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0232.cpp"
+            },
+            "_ZN1XC2EPFvvE": {
+                "callees": {},
+                "functionName": "_ZN1XC2EPFvvE",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0232.cpp"
+            },
+            "_ZN1XD2Ev": {
+                "callees": {},
+                "functionName": "_ZN1XD2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0232.cpp"
+            },
+            "_ZdlPvm": {
+                "callees": {},
+                "functionName": "_ZdlPvm",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "_Znwm": {
+                "callees": {},
+                "functionName": "_Znwm",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "main": {
+                "callees": {
+                    "_ZN1XC2EPFvvE": {},
+                    "_ZN1XD2Ev": {},
+                    "_ZdlPvm": {},
+                    "_Znwm": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0232.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0232.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0232.pta-signature.gtmcg
new file mode 100644
index 00000000..88e00fd2
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0232.pta-signature.gtmcg
@@ -0,0 +1,64 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z5func1v": {
+                "callees": {},
+                "functionName": "_Z5func1v",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0232.cpp"
+            },
+            "_ZN1XC2EPFvvE": {
+                "callees": {},
+                "functionName": "_ZN1XC2EPFvvE",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0232.cpp"
+            },
+            "_ZN1XD2Ev": {
+                "callees": {
+                    "_Z5func1v": {}
+                },
+                "functionName": "_ZN1XD2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0232.cpp"
+            },
+            "_ZdlPvm": {
+                "callees": {},
+                "functionName": "_ZdlPvm",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "_Znwm": {
+                "callees": {},
+                "functionName": "_Znwm",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "main": {
+                "callees": {
+                    "_ZN1XC2EPFvvE": {},
+                    "_ZN1XD2Ev": {},
+                    "_ZdlPvm": {},
+                    "_Znwm": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0232.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0233.cpp b/tools/cage/test/input/singleTU/0233.cpp
new file mode 100644
index 00000000..2d0969d9
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0233.cpp
@@ -0,0 +1,6 @@
+// Test for a new call invoving a builtin type
+int main() {
+  int a = 1;
+  int* bp = new int(a);
+  int c = *bp;
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0233.gtmcg b/tools/cage/test/input/singleTU/0233.gtmcg
new file mode 100644
index 00000000..dda3c58d
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0233.gtmcg
@@ -0,0 +1,31 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Znwm": {
+                "callees": {},
+                "functionName": "_Znwm",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "main": {
+                "callees": {
+                    "_Znwm": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0233.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0233.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0233.pta-signature.gtmcg
new file mode 100644
index 00000000..dda3c58d
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0233.pta-signature.gtmcg
@@ -0,0 +1,31 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Znwm": {
+                "callees": {},
+                "functionName": "_Znwm",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "main": {
+                "callees": {
+                    "_Znwm": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0233.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0234.cpp b/tools/cage/test/input/singleTU/0234.cpp
new file mode 100644
index 00000000..72b67391
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0234.cpp
@@ -0,0 +1,16 @@
+// Tests an explicit destructor call
+typedef void (*Fn)();
+
+void func1() {}
+
+class X {
+ public:
+  Fn function;
+  X(Fn arg) { function = arg; }
+  ~X() { function(); }
+};
+
+int main() {
+  const auto f = new X(func1);
+  f->~X();
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0234.gtmcg b/tools/cage/test/input/singleTU/0234.gtmcg
new file mode 100644
index 00000000..3c2f8ae9
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0234.gtmcg
@@ -0,0 +1,54 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z5func1v": {
+                "callees": {},
+                "functionName": "_Z5func1v",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0234.cpp"
+            },
+            "_ZN1XC2EPFvvE": {
+                "callees": {},
+                "functionName": "_ZN1XC2EPFvvE",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0234.cpp"
+            },
+            "_ZN1XD2Ev": {
+                "callees": {},
+                "functionName": "_ZN1XD2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0234.cpp"
+            },
+            "_Znwm": {
+                "callees": {},
+                "functionName": "_Znwm",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "main": {
+                "callees": {
+                    "_ZN1XC2EPFvvE": {},
+                    "_ZN1XD2Ev": {},
+                    "_Znwm": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0234.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0234.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0234.pta-signature.gtmcg
new file mode 100644
index 00000000..4e985ea7
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0234.pta-signature.gtmcg
@@ -0,0 +1,56 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z5func1v": {
+                "callees": {},
+                "functionName": "_Z5func1v",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0234.cpp"
+            },
+            "_ZN1XC2EPFvvE": {
+                "callees": {},
+                "functionName": "_ZN1XC2EPFvvE",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0234.cpp"
+            },
+            "_ZN1XD2Ev": {
+                "callees": {
+                    "_Z5func1v": {}
+                },
+                "functionName": "_ZN1XD2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0234.cpp"
+            },
+            "_Znwm": {
+                "callees": {},
+                "functionName": "_Znwm",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "main": {
+                "callees": {
+                    "_ZN1XC2EPFvvE": {},
+                    "_ZN1XD2Ev": {},
+                    "_Znwm": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0234.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0235.cpp b/tools/cage/test/input/singleTU/0235.cpp
new file mode 100644
index 00000000..2dd98573
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0235.cpp
@@ -0,0 +1,20 @@
+// Tests passing function pointers as C++ style constructor init
+
+typedef void (*Function)();
+
+void foo() {}
+
+__attribute__((retain)) void bar() {}
+
+class C {
+ public:
+  C(Function F) : member(F) {};
+
+  Function member;
+};
+
+int main() {
+  C a(&foo);
+  Function b = a.member;
+  b();
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0235.gtmcg b/tools/cage/test/input/singleTU/0235.gtmcg
new file mode 100644
index 00000000..c8480f7c
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0235.gtmcg
@@ -0,0 +1,45 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3barv": {
+                "callees": {},
+                "functionName": "_Z3barv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0235.cpp"
+            },
+            "_Z3foov": {
+                "callees": {},
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0235.cpp"
+            },
+            "_ZN1CC2EPFvvE": {
+                "callees": {},
+                "functionName": "_ZN1CC2EPFvvE",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0235.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN1CC2EPFvvE": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0235.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0235.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0235.pta-signature.gtmcg
new file mode 100644
index 00000000..1a576041
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0235.pta-signature.gtmcg
@@ -0,0 +1,47 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3barv": {
+                "callees": {},
+                "functionName": "_Z3barv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0235.cpp"
+            },
+            "_Z3foov": {
+                "callees": {},
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0235.cpp"
+            },
+            "_ZN1CC2EPFvvE": {
+                "callees": {},
+                "functionName": "_ZN1CC2EPFvvE",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0235.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z3barv": {},
+                    "_Z3foov": {},
+                    "_ZN1CC2EPFvvE": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0235.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0237.cpp b/tools/cage/test/input/singleTU/0237.cpp
new file mode 100644
index 00000000..742e0c26
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0237.cpp
@@ -0,0 +1,25 @@
+// Tests for c++ style constructor init
+int foo() {};
+int boo() {};
+using FType = decltype(foo);
+
+class B {
+ public:
+  B(FType* arg) { f1 = arg; };
+  FType* f1;
+};
+
+class C : B {
+ public:
+  C(FType* arg1, FType* arg2) : B(arg1), f2(arg2) {}
+  FType* f2;
+  void work() {
+    f1();
+    f2();
+  }
+};
+
+int main() {
+  C c(foo, boo);
+  c.work();
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0237.gtmcg b/tools/cage/test/input/singleTU/0237.gtmcg
new file mode 100644
index 00000000..d46bf518
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0237.gtmcg
@@ -0,0 +1,62 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3boov": {
+                "callees": {},
+                "functionName": "_Z3boov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0237.cpp"
+            },
+            "_Z3foov": {
+                "callees": {},
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0237.cpp"
+            },
+            "_ZN1BC2EPFivE": {
+                "callees": {},
+                "functionName": "_ZN1BC2EPFivE",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0237.cpp"
+            },
+            "_ZN1C4workEv": {
+                "callees": {},
+                "functionName": "_ZN1C4workEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0237.cpp"
+            },
+            "_ZN1CC2EPFivES1_": {
+                "callees": {
+                    "_ZN1BC2EPFivE": {}
+                },
+                "functionName": "_ZN1CC2EPFivES1_",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0237.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN1C4workEv": {},
+                    "_ZN1CC2EPFivES1_": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0237.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0237.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0237.pta-signature.gtmcg
new file mode 100644
index 00000000..c35b414f
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0237.pta-signature.gtmcg
@@ -0,0 +1,66 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z3boov": {
+                "callees": {},
+                "functionName": "_Z3boov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0237.cpp"
+            },
+            "_Z3foov": {
+                "callees": {},
+                "functionName": "_Z3foov",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0237.cpp"
+            },
+            "_ZN1BC2EPFivE": {
+                "callees": {},
+                "functionName": "_ZN1BC2EPFivE",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0237.cpp"
+            },
+            "_ZN1C4workEv": {
+                "callees": {
+                    "_Z3boov": {},
+                    "_Z3foov": {},
+                    "main": {}
+                },
+                "functionName": "_ZN1C4workEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0237.cpp"
+            },
+            "_ZN1CC2EPFivES1_": {
+                "callees": {
+                    "_ZN1BC2EPFivE": {}
+                },
+                "functionName": "_ZN1CC2EPFivES1_",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0237.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN1C4workEv": {},
+                    "_ZN1CC2EPFivES1_": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0237.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0300.cpp b/tools/cage/test/input/singleTU/0300.cpp
new file mode 100644
index 00000000..0bf7d7f5
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0300.cpp
@@ -0,0 +1,15 @@
+// Checking that the call target overapproximation is not used on already resolved virtual calls.
+struct Base {
+  virtual void foo() {};
+  virtual void bar() {};
+};
+
+struct Derived : public Base {
+  void foo() override {}
+};
+
+int main() {
+  Base* b = new Derived;
+  b->foo();
+  return 0;
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0300.gtmcg b/tools/cage/test/input/singleTU/0300.gtmcg
new file mode 100644
index 00000000..9c52250a
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0300.gtmcg
@@ -0,0 +1,71 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN4Base3barEv": {
+                "callees": {},
+                "functionName": "_ZN4Base3barEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0300.cpp"
+            },
+            "_ZN4Base3fooEv": {
+                "callees": {},
+                "functionName": "_ZN4Base3fooEv",
+                "hasBody": false,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0300.cpp"
+            },
+            "_ZN4BaseC2Ev": {
+                "callees": {},
+                "functionName": "_ZN4BaseC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0300.cpp"
+            },
+            "_ZN7Derived3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7Derived3fooEv",
+                "hasBody": false,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0300.cpp"
+            },
+            "_ZN7DerivedC2Ev": {
+                "callees": {
+                    "_ZN4BaseC2Ev": {}
+                },
+                "functionName": "_ZN7DerivedC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0300.cpp"
+            },
+            "_Znwm": {
+                "callees": {},
+                "functionName": "_Znwm",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "main": {
+                "callees": {
+                    "_ZN4Base3fooEv": {},
+                    "_ZN7Derived3fooEv": {},
+                    "_ZN7DerivedC2Ev": {},
+                    "_Znwm": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0300.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/singleTU/0300.pta-signature.gtmcg b/tools/cage/test/input/singleTU/0300.pta-signature.gtmcg
new file mode 100644
index 00000000..9c52250a
--- /dev/null
+++ b/tools/cage/test/input/singleTU/0300.pta-signature.gtmcg
@@ -0,0 +1,71 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN4Base3barEv": {
+                "callees": {},
+                "functionName": "_ZN4Base3barEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0300.cpp"
+            },
+            "_ZN4Base3fooEv": {
+                "callees": {},
+                "functionName": "_ZN4Base3fooEv",
+                "hasBody": false,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0300.cpp"
+            },
+            "_ZN4BaseC2Ev": {
+                "callees": {},
+                "functionName": "_ZN4BaseC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0300.cpp"
+            },
+            "_ZN7Derived3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7Derived3fooEv",
+                "hasBody": false,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0300.cpp"
+            },
+            "_ZN7DerivedC2Ev": {
+                "callees": {
+                    "_ZN4BaseC2Ev": {}
+                },
+                "functionName": "_ZN7DerivedC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0300.cpp"
+            },
+            "_Znwm": {
+                "callees": {},
+                "functionName": "_Znwm",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "main": {
+                "callees": {
+                    "_ZN4Base3fooEv": {},
+                    "_ZN7Derived3fooEv": {},
+                    "_ZN7DerivedC2Ev": {},
+                    "_Znwm": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/singleTU/0300.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0006.cpp b/tools/cage/test/input/virtualCalls/0006.cpp
new file mode 100644
index 00000000..4d012934
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0006.cpp
@@ -0,0 +1,13 @@
+// call to constructor and member function
+
+class MyClass {
+ public:
+  void foo() {}
+};
+
+int main(int argc, char* argv[]) {
+  MyClass mc;
+  mc.foo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0006.gtmcg b/tools/cage/test/input/virtualCalls/0006.gtmcg
new file mode 100644
index 00000000..a657202f
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0006.gtmcg
@@ -0,0 +1,31 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN7MyClass3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7MyClass3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0006.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN7MyClass3fooEv": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0006.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0007.cpp b/tools/cage/test/input/virtualCalls/0007.cpp
new file mode 100644
index 00000000..ae7c8b17
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0007.cpp
@@ -0,0 +1,14 @@
+// call to constructor and virtual destructor
+
+class MyClass {
+ public:
+  MyClass(int b) { int c = b; }
+  virtual ~MyClass() {}
+};
+
+int main(int argc, char* argv[]) {
+  int a = 42;
+  MyClass mc(a);
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0007.gtmcg b/tools/cage/test/input/virtualCalls/0007.gtmcg
new file mode 100644
index 00000000..c3f877ad
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0007.gtmcg
@@ -0,0 +1,56 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN7MyClassC2Ei": {
+                "callees": {},
+                "functionName": "_ZN7MyClassC2Ei",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0007.cpp"
+            },
+            "_ZN7MyClassD0Ev": {
+                "callees": {
+                    "_ZN7MyClassD2Ev": {},
+                    "_ZdlPvm": {}
+                },
+                "functionName": "_ZN7MyClassD0Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0007.cpp"
+            },
+            "_ZN7MyClassD2Ev": {
+                "callees": {},
+                "functionName": "_ZN7MyClassD2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0007.cpp"
+            },
+            "_ZdlPvm": {
+                "callees": {},
+                "functionName": "_ZdlPvm",
+                "hasBody": false,
+                "meta": {},
+                "origin": null
+            },
+            "main": {
+                "callees": {
+                    "_ZN7MyClassC2Ei": {},
+                    "_ZN7MyClassD2Ev": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0007.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0008.cpp b/tools/cage/test/input/virtualCalls/0008.cpp
new file mode 100644
index 00000000..8ea1c0d9
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0008.cpp
@@ -0,0 +1,21 @@
+// call to overriding function
+
+class MyClass {
+ public:
+  virtual void foo() {}
+};
+
+class MyClassDerive : public MyClass {
+ public:
+  void foo() override;
+};
+
+void MyClassDerive::foo() {}
+
+int main(int argc, char* argv[]) {
+  MyClass mc;
+  MyClassDerive mcd;
+  mcd.foo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0008.gtmcg b/tools/cage/test/input/virtualCalls/0008.gtmcg
new file mode 100644
index 00000000..375d0171
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0008.gtmcg
@@ -0,0 +1,56 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN13MyClassDerive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0008.cpp"
+            },
+            "_ZN13MyClassDeriveC2Ev": {
+                "callees": {
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "_ZN13MyClassDeriveC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0008.cpp"
+            },
+            "_ZN7MyClass3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7MyClass3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0008.cpp"
+            },
+            "_ZN7MyClassC2Ev": {
+                "callees": {},
+                "functionName": "_ZN7MyClassC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0008.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN13MyClassDerive3fooEv": {},
+                    "_ZN13MyClassDeriveC2Ev": {},
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0008.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0009.cpp b/tools/cage/test/input/virtualCalls/0009.cpp
new file mode 100644
index 00000000..fefdc13b
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0009.cpp
@@ -0,0 +1,21 @@
+// call to overwritten function
+
+class MyClass {
+ public:
+  virtual void foo() {}
+};
+
+class MyClassDerive : public MyClass {
+ public:
+  void foo() override;
+};
+
+void MyClassDerive::foo() {}
+
+int main(int argc, char* argv[]) {
+  MyClass mc;
+  MyClassDerive mcd;
+  mc.foo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0009.gtmcg b/tools/cage/test/input/virtualCalls/0009.gtmcg
new file mode 100644
index 00000000..e00a37be
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0009.gtmcg
@@ -0,0 +1,56 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN13MyClassDerive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0009.cpp"
+            },
+            "_ZN13MyClassDeriveC2Ev": {
+                "callees": {
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "_ZN13MyClassDeriveC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0009.cpp"
+            },
+            "_ZN7MyClass3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7MyClass3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0009.cpp"
+            },
+            "_ZN7MyClassC2Ev": {
+                "callees": {},
+                "functionName": "_ZN7MyClassC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0009.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN13MyClassDeriveC2Ev": {},
+                    "_ZN7MyClass3fooEv": {},
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0009.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0010.cpp b/tools/cage/test/input/virtualCalls/0010.cpp
new file mode 100644
index 00000000..e0c46a2f
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0010.cpp
@@ -0,0 +1,29 @@
+// call to overriding and overwritten functions
+
+class MyClass {
+ public:
+  virtual void foo() {}
+  virtual int bar() { return 0; }
+};
+
+class MyClassDerive : public MyClass {
+ public:
+  void foo() override;
+  int bar() final;
+};
+
+void MyClassDerive::foo() {}
+int MyClassDerive::bar() { return 1; }
+
+void callsBar(MyClassDerive& mcd) { mcd.bar(); }
+
+int main(int argc, char* argv[]) {
+  MyClass mc;
+  MyClassDerive mcd;
+  mc.foo();
+  mc.bar();
+
+  callsBar(mcd);
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0010.gtmcg b/tools/cage/test/input/virtualCalls/0010.gtmcg
new file mode 100644
index 00000000..429c206f
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0010.gtmcg
@@ -0,0 +1,81 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_Z8callsBarR13MyClassDerive": {
+                "callees": {
+                    "_ZN13MyClassDerive3barEv": {}
+                },
+                "functionName": "_Z8callsBarR13MyClassDerive",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0010.cpp"
+            },
+            "_ZN13MyClassDerive3barEv": {
+                "callees": {},
+                "functionName": "_ZN13MyClassDerive3barEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0010.cpp"
+            },
+            "_ZN13MyClassDerive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0010.cpp"
+            },
+            "_ZN13MyClassDeriveC2Ev": {
+                "callees": {
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "_ZN13MyClassDeriveC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0010.cpp"
+            },
+            "_ZN7MyClass3barEv": {
+                "callees": {},
+                "functionName": "_ZN7MyClass3barEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0010.cpp"
+            },
+            "_ZN7MyClass3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7MyClass3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0010.cpp"
+            },
+            "_ZN7MyClassC2Ev": {
+                "callees": {},
+                "functionName": "_ZN7MyClassC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0010.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_Z8callsBarR13MyClassDerive": {},
+                    "_ZN13MyClassDeriveC2Ev": {},
+                    "_ZN7MyClass3barEv": {},
+                    "_ZN7MyClass3fooEv": {},
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0010.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0011.cpp b/tools/cage/test/input/virtualCalls/0011.cpp
new file mode 100644
index 00000000..5cd8ba4d
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0011.cpp
@@ -0,0 +1,20 @@
+// call to redefined function
+
+class MyClass {};
+
+class MyClassDerive : public MyClass {
+ public:
+  int foo() { return 0; }
+};
+
+class MyClassDeriveD : public MyClassDerive {
+ public:
+  int foo() { return 1; }
+};
+
+int main(int argc, char* argv[]) {
+  MyClassDerive mcd;
+  mcd.foo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0011.gtmcg b/tools/cage/test/input/virtualCalls/0011.gtmcg
new file mode 100644
index 00000000..2f94c5e3
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0011.gtmcg
@@ -0,0 +1,31 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN13MyClassDerive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0011.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN13MyClassDerive3fooEv": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0011.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0012.cpp b/tools/cage/test/input/virtualCalls/0012.cpp
new file mode 100644
index 00000000..2e7bccb9
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0012.cpp
@@ -0,0 +1,20 @@
+// call to redefining function
+
+class MyClass {};
+
+class MyClassDerive : public MyClass {
+ public:
+  int foo() { return 0; }
+};
+
+class MyClassDeriveD : public MyClassDerive {
+ public:
+  int foo() { return 1; }
+};
+
+int main(int argc, char* argv[]) {
+  MyClassDeriveD mcdd;
+  mcdd.foo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0012.gtmcg b/tools/cage/test/input/virtualCalls/0012.gtmcg
new file mode 100644
index 00000000..cc08ecbe
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0012.gtmcg
@@ -0,0 +1,31 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN14MyClassDeriveD3fooEv": {
+                "callees": {},
+                "functionName": "_ZN14MyClassDeriveD3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0012.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN14MyClassDeriveD3fooEv": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0012.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0015.cpp b/tools/cage/test/input/virtualCalls/0015.cpp
new file mode 100644
index 00000000..6762940c
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0015.cpp
@@ -0,0 +1,27 @@
+// 2 overrides in a row
+// but no multiple inheritanc
+
+class MyClass {
+ public:
+  virtual void foo() {}
+};
+
+class MyClass2 : public MyClass {
+ public:
+  virtual void foo() override {}
+};
+
+class MyClassDerive : public MyClass2 {
+ public:
+  void foo() override;
+};
+
+void MyClassDerive::foo() {}
+
+int main(int argc, char* argv[]) {
+  MyClass mc;
+  MyClassDerive mcd;
+  mc.foo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0015.gtmcg b/tools/cage/test/input/virtualCalls/0015.gtmcg
new file mode 100644
index 00000000..4282cba0
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0015.gtmcg
@@ -0,0 +1,72 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN13MyClassDerive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0015.cpp"
+            },
+            "_ZN13MyClassDeriveC2Ev": {
+                "callees": {
+                    "_ZN8MyClass2C2Ev": {}
+                },
+                "functionName": "_ZN13MyClassDeriveC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0015.cpp"
+            },
+            "_ZN7MyClass3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7MyClass3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0015.cpp"
+            },
+            "_ZN7MyClassC2Ev": {
+                "callees": {},
+                "functionName": "_ZN7MyClassC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0015.cpp"
+            },
+            "_ZN8MyClass23fooEv": {
+                "callees": {},
+                "functionName": "_ZN8MyClass23fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0015.cpp"
+            },
+            "_ZN8MyClass2C2Ev": {
+                "callees": {
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "_ZN8MyClass2C2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0015.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN13MyClassDeriveC2Ev": {},
+                    "_ZN7MyClass3fooEv": {},
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0015.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0016.cpp b/tools/cage/test/input/virtualCalls/0016.cpp
new file mode 100644
index 00000000..5c901ccf
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0016.cpp
@@ -0,0 +1,26 @@
+// override multiple functions
+
+class MyClass {
+ public:
+  virtual void foo() {}
+};
+
+class MyClass2 {
+ public:
+  virtual void foo() {}
+};
+
+class MyClassDerive : public MyClass, public MyClass2 {
+ public:
+  void foo() override;
+};
+
+void MyClassDerive::foo() {}
+
+int main(int argc, char* argv[]) {
+  MyClass mc;
+  MyClassDerive mcd;
+  mc.foo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0016.gtmcg b/tools/cage/test/input/virtualCalls/0016.gtmcg
new file mode 100644
index 00000000..8f3eb0f6
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0016.gtmcg
@@ -0,0 +1,80 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN13MyClassDerive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0016.cpp"
+            },
+            "_ZN13MyClassDeriveC2Ev": {
+                "callees": {
+                    "_ZN7MyClassC2Ev": {},
+                    "_ZN8MyClass2C2Ev": {}
+                },
+                "functionName": "_ZN13MyClassDeriveC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0016.cpp"
+            },
+            "_ZN7MyClass3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7MyClass3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0016.cpp"
+            },
+            "_ZN7MyClassC2Ev": {
+                "callees": {},
+                "functionName": "_ZN7MyClassC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0016.cpp"
+            },
+            "_ZN8MyClass23fooEv": {
+                "callees": {},
+                "functionName": "_ZN8MyClass23fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0016.cpp"
+            },
+            "_ZN8MyClass2C2Ev": {
+                "callees": {},
+                "functionName": "_ZN8MyClass2C2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0016.cpp"
+            },
+            "_ZThn8_N13MyClassDerive3fooEv": {
+                "callees": {
+                    "_ZN13MyClassDerive3fooEv": {}
+                },
+                "functionName": "_ZThn8_N13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0016.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN13MyClassDeriveC2Ev": {},
+                    "_ZN7MyClass3fooEv": {},
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0016.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0017.cpp b/tools/cage/test/input/virtualCalls/0017.cpp
new file mode 100644
index 00000000..3f9d27d0
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0017.cpp
@@ -0,0 +1,29 @@
+// override multiple functions
+// override function of super super class
+
+class MyClass {
+ public:
+  virtual void foo() {}
+};
+
+class MyClass2 {
+ public:
+  virtual void foo() {}
+};
+
+class MyClassStep : public MyClass2 {};
+
+class MyClassDerive : public MyClass, public MyClassStep {
+ public:
+  void foo() override;
+};
+
+void MyClassDerive::foo() {}
+
+int main(int argc, char* argv[]) {
+  MyClass mc;
+  MyClassDerive mcd;
+  mc.foo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0017.gtmcg b/tools/cage/test/input/virtualCalls/0017.gtmcg
new file mode 100644
index 00000000..0dae68f6
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0017.gtmcg
@@ -0,0 +1,89 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN11MyClassStepC2Ev": {
+                "callees": {
+                    "_ZN8MyClass2C2Ev": {}
+                },
+                "functionName": "_ZN11MyClassStepC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0017.cpp"
+            },
+            "_ZN13MyClassDerive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0017.cpp"
+            },
+            "_ZN13MyClassDeriveC2Ev": {
+                "callees": {
+                    "_ZN11MyClassStepC2Ev": {},
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "_ZN13MyClassDeriveC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0017.cpp"
+            },
+            "_ZN7MyClass3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7MyClass3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0017.cpp"
+            },
+            "_ZN7MyClassC2Ev": {
+                "callees": {},
+                "functionName": "_ZN7MyClassC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0017.cpp"
+            },
+            "_ZN8MyClass23fooEv": {
+                "callees": {},
+                "functionName": "_ZN8MyClass23fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0017.cpp"
+            },
+            "_ZN8MyClass2C2Ev": {
+                "callees": {},
+                "functionName": "_ZN8MyClass2C2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0017.cpp"
+            },
+            "_ZThn8_N13MyClassDerive3fooEv": {
+                "callees": {
+                    "_ZN13MyClassDerive3fooEv": {}
+                },
+                "functionName": "_ZThn8_N13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0017.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN13MyClassDeriveC2Ev": {},
+                    "_ZN7MyClass3fooEv": {},
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0017.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0018.cpp b/tools/cage/test/input/virtualCalls/0018.cpp
new file mode 100644
index 00000000..1167fe7d
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0018.cpp
@@ -0,0 +1,26 @@
+// inheritance circle
+
+class MyClass {
+ public:
+  virtual void foo() {}
+};
+
+class MyClass2 : public MyClass {
+ public:
+  virtual void foo() override {}
+};
+
+class MyClassDerive : public MyClass, public MyClass2 {
+ public:
+  void foo() override;
+};
+
+void MyClassDerive::foo() {}
+
+int main(int argc, char* argv[]) {
+  MyClass mc;
+  MyClassDerive mcd;
+  mc.foo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0018.gtmcg b/tools/cage/test/input/virtualCalls/0018.gtmcg
new file mode 100644
index 00000000..48d881d4
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0018.gtmcg
@@ -0,0 +1,82 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN13MyClassDerive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0018.cpp"
+            },
+            "_ZN13MyClassDeriveC2Ev": {
+                "callees": {
+                    "_ZN7MyClassC2Ev": {},
+                    "_ZN8MyClass2C2Ev": {}
+                },
+                "functionName": "_ZN13MyClassDeriveC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0018.cpp"
+            },
+            "_ZN7MyClass3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7MyClass3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0018.cpp"
+            },
+            "_ZN7MyClassC2Ev": {
+                "callees": {},
+                "functionName": "_ZN7MyClassC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0018.cpp"
+            },
+            "_ZN8MyClass23fooEv": {
+                "callees": {},
+                "functionName": "_ZN8MyClass23fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0018.cpp"
+            },
+            "_ZN8MyClass2C2Ev": {
+                "callees": {
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "_ZN8MyClass2C2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0018.cpp"
+            },
+            "_ZThn8_N13MyClassDerive3fooEv": {
+                "callees": {
+                    "_ZN13MyClassDerive3fooEv": {}
+                },
+                "functionName": "_ZThn8_N13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0018.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN13MyClassDeriveC2Ev": {},
+                    "_ZN7MyClass3fooEv": {},
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0018.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0019.cpp b/tools/cage/test/input/virtualCalls/0019.cpp
new file mode 100644
index 00000000..2b207414
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0019.cpp
@@ -0,0 +1,22 @@
+// call to overwritten function by pointer of base class
+
+class MyClass {
+ public:
+  virtual void foo() {}
+};
+
+class MyClassDerive : public MyClass {
+ public:
+  void foo() override;
+};
+
+void MyClassDerive::foo() {}
+
+int main(int argc, char* argv[]) {
+  MyClass* mc;
+  MyClassDerive mcd;
+  mc = &mcd;
+  mc->foo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0019.gtmcg b/tools/cage/test/input/virtualCalls/0019.gtmcg
new file mode 100644
index 00000000..33465941
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0019.gtmcg
@@ -0,0 +1,56 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN13MyClassDerive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0019.cpp"
+            },
+            "_ZN13MyClassDeriveC2Ev": {
+                "callees": {
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "_ZN13MyClassDeriveC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0019.cpp"
+            },
+            "_ZN7MyClass3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7MyClass3fooEv",
+                "hasBody": false,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0019.cpp"
+            },
+            "_ZN7MyClassC2Ev": {
+                "callees": {},
+                "functionName": "_ZN7MyClassC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0019.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN13MyClassDerive3fooEv": {},
+                    "_ZN13MyClassDeriveC2Ev": {},
+                    "_ZN7MyClass3fooEv": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0019.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0020.cpp b/tools/cage/test/input/virtualCalls/0020.cpp
new file mode 100644
index 00000000..f7a69ee6
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0020.cpp
@@ -0,0 +1,22 @@
+// call to overwritten function by pointer of current class
+
+class MyClass {
+ public:
+  virtual void foo() {}
+};
+
+class MyClassDerive : public MyClass {
+ public:
+  void foo() override;
+};
+
+void MyClassDerive::foo() {}
+
+int main(int argc, char* argv[]) {
+  MyClassDerive* mc;
+  MyClassDerive mcd;
+  mc = &mcd;
+  mc->foo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0020.gtmcg b/tools/cage/test/input/virtualCalls/0020.gtmcg
new file mode 100644
index 00000000..99b91871
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0020.gtmcg
@@ -0,0 +1,55 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN13MyClassDerive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0020.cpp"
+            },
+            "_ZN13MyClassDeriveC2Ev": {
+                "callees": {
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "_ZN13MyClassDeriveC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0020.cpp"
+            },
+            "_ZN7MyClass3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7MyClass3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0020.cpp"
+            },
+            "_ZN7MyClassC2Ev": {
+                "callees": {},
+                "functionName": "_ZN7MyClassC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0020.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN13MyClassDerive3fooEv": {},
+                    "_ZN13MyClassDeriveC2Ev": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0020.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0021.cpp b/tools/cage/test/input/virtualCalls/0021.cpp
new file mode 100644
index 00000000..20162760
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0021.cpp
@@ -0,0 +1,27 @@
+// call to overwritten function by pointer of middle class
+
+class MyClass {
+ public:
+  virtual void foo() {}
+};
+
+class MyClassDerive : public MyClass {
+ public:
+  void foo() override;
+};
+
+class MyClassDeriveDerive : public MyClassDerive {
+ public:
+  void foo() override {};
+};
+
+void MyClassDerive::foo() {}
+
+int main(int argc, char* argv[]) {
+  MyClassDerive* mc;
+  MyClassDeriveDerive mcd;
+  mc = &mcd;
+  mc->foo();
+
+  return 0;
+}
diff --git a/tools/cage/test/input/virtualCalls/0021.gtmcg b/tools/cage/test/input/virtualCalls/0021.gtmcg
new file mode 100644
index 00000000..ff0918ba
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0021.gtmcg
@@ -0,0 +1,72 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN13MyClassDerive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN13MyClassDerive3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0021.cpp"
+            },
+            "_ZN13MyClassDeriveC2Ev": {
+                "callees": {
+                    "_ZN7MyClassC2Ev": {}
+                },
+                "functionName": "_ZN13MyClassDeriveC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0021.cpp"
+            },
+            "_ZN19MyClassDeriveDerive3fooEv": {
+                "callees": {},
+                "functionName": "_ZN19MyClassDeriveDerive3fooEv",
+                "hasBody": false,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0021.cpp"
+            },
+            "_ZN19MyClassDeriveDeriveC2Ev": {
+                "callees": {
+                    "_ZN13MyClassDeriveC2Ev": {}
+                },
+                "functionName": "_ZN19MyClassDeriveDeriveC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0021.cpp"
+            },
+            "_ZN7MyClass3fooEv": {
+                "callees": {},
+                "functionName": "_ZN7MyClass3fooEv",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0021.cpp"
+            },
+            "_ZN7MyClassC2Ev": {
+                "callees": {},
+                "functionName": "_ZN7MyClassC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0021.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN13MyClassDerive3fooEv": {},
+                    "_ZN19MyClassDeriveDerive3fooEv": {},
+                    "_ZN19MyClassDeriveDeriveC2Ev": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0021.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0022.cpp b/tools/cage/test/input/virtualCalls/0022.cpp
new file mode 100644
index 00000000..e3bcd764
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0022.cpp
@@ -0,0 +1,32 @@
+// Test for checking that functions in uninstantiated templates do not get included into the callgraph and to check the
+// name mangling of virtual functions in classes that depend on template parameters.
+template <typename T>
+class BaseUnused {
+ public:
+  virtual void bad1() {}
+};
+
+template <typename U>
+class ChildUnused : public BaseUnused<U> {
+ public:
+  virtual void bad2() {}
+};
+
+template <typename T>
+class BaseUsed {
+ public:
+  virtual void good1() {}
+};
+
+template <typename U>
+class ChildUsed : public BaseUsed<U> {
+ public:
+  virtual void good2() {}
+};
+
+int main() {
+  ChildUsed<int> var;
+  var.good1();
+  var.good2();
+  return 0;
+}
\ No newline at end of file
diff --git a/tools/cage/test/input/virtualCalls/0022.gtmcg b/tools/cage/test/input/virtualCalls/0022.gtmcg
new file mode 100644
index 00000000..be068141
--- /dev/null
+++ b/tools/cage/test/input/virtualCalls/0022.gtmcg
@@ -0,0 +1,56 @@
+{
+    "_CG": {
+        "meta": {},
+        "nodes": {
+            "_ZN8BaseUsedIiE5good1Ev": {
+                "callees": {},
+                "functionName": "_ZN8BaseUsedIiE5good1Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0022.cpp"
+            },
+            "_ZN8BaseUsedIiEC2Ev": {
+                "callees": {},
+                "functionName": "_ZN8BaseUsedIiEC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0022.cpp"
+            },
+            "_ZN9ChildUsedIiE5good2Ev": {
+                "callees": {},
+                "functionName": "_ZN9ChildUsedIiE5good2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0022.cpp"
+            },
+            "_ZN9ChildUsedIiEC2Ev": {
+                "callees": {
+                    "_ZN8BaseUsedIiEC2Ev": {}
+                },
+                "functionName": "_ZN9ChildUsedIiEC2Ev",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0022.cpp"
+            },
+            "main": {
+                "callees": {
+                    "_ZN8BaseUsedIiE5good1Ev": {},
+                    "_ZN9ChildUsedIiE5good2Ev": {},
+                    "_ZN9ChildUsedIiEC2Ev": {}
+                },
+                "functionName": "main",
+                "hasBody": true,
+                "meta": {},
+                "origin": "tools/cage/test/input/virtualCalls/0022.cpp"
+            }
+        }
+    },
+    "_MetaCG": {
+        "generator": {
+            "name": "CaGe",
+            "sha": "3d2c51dee0f8d51d50c706b8a724bacd40b71170",
+            "version": "0.1"
+        },
+        "version": "4.0"
+    }
+}
\ No newline at end of file
diff --git a/tools/cage/test/runCaGeTests.sh.in b/tools/cage/test/runCaGeTests.sh.in
new file mode 100755
index 00000000..7744545f
--- /dev/null
+++ b/tools/cage/test/runCaGeTests.sh.in
@@ -0,0 +1,212 @@
+#!/usr/bin/env bash
+
+test_src_dir="@TEST_SRC_DIR@"
+mcgconfig="@METACG_CONFIG@"
+build_dir="@CMAKE_BINARY_DIR@"
+cgdiff="$build_dir/tools/cgdiff/cgdiff"
+cgmerge="$build_dir/tools/cgmerge2/cgmerge2"
+
+suite_pattern=".*"
+verbose=0
+
+mkdir -p log
+
+# Run single source test case.
+# Param 1: Name of the test case.
+# Param 2: Path to the test case.
+# Param 3: Variant name.
+# Param 4: MCGConfig options.
+# Param 5: Extra compile flags.
+# Param 6: re-generate gt.
+function runTestCase {
+  testCaseName=$1
+  testCasePath=$2
+  variant=$3
+  addOptions=$4
+  addFlags=$5
+  regenerate_gt=$6
+  fail=0
+
+  run_dir=$(realpath --relative-to="$test_src_dir" "$testCasePath")
+  mkdir -p $run_dir
+
+
+  extendedName=$testCaseName
+  if [[ -n "$variant" ]]; then
+    extendedName="$testCaseName.$variant"
+  fi
+
+  cg_outfilename=$extendedName.mcg
+  cg_outfile="$run_dir/$cg_outfilename"
+  cg_gtfile="$testCasePath/$extendedName.gtmcg"
+  diff_file=${cg_outfile/mcg/cgdiff}
+
+  rm -f "$cg_outfile" "$diff_file"
+
+  o_files=()
+
+  for testTU in $(ls $testCasePath | grep "$testCaseName.*\.cpp"); do
+    failed=0
+    tfile_out="$run_dir/$testTU.o"
+    rm -f "$tfile_out"
+    clang++ -c -g `$mcgconfig --cage-cxxflags` ${addFlags} -fno-exceptions "$testCasePath/$testTU" -o  "$tfile_out" >> log/testrun.log 2>&1 || failed=1
+    if [[ $failed -ne 0 ]] || [[ $verbose -eq 1 ]]; then
+      echo "Compile command: clang++ -c -g `$mcgconfig --cage-cxxflags` ${addFlags} -fno-exceptions $testCasePath/$testTU -o $tfile_out"
+    fi
+    if [[ $failed -ne 0 ]]; then
+      echo "Compilation failed!"
+      return 1
+    fi
+    o_files+=($tfile_out)
+  done
+
+  failed=0
+  tfile_out="$run_dir/$testCaseName.exe"
+  rm -f "$tfile_out"
+  clang++ -g `$mcgconfig --cage-ldflags --cage-pass-option "-cg-file=${cg_outfile}" ${addOptions}` ${addFlags} -fno-exceptions ${o_files[@]} -o  "$tfile_out" >> log/testrun.log 2>&1 || failed=1
+  if [[ $failed -ne 0 ]] || [[ $verbose -eq 1 ]]; then
+    echo "Link command: clang++ -g `$mcgconfig --cage-ldflags --cage-pass-option "-cg-file=${cg_outfile}" ${addOptions}` ${addFlags} -fno-exceptions ${o_files[@]} -o  $tfile_out"
+  fi
+  if [[ $failed -ne 0 ]]; then
+    if [[ ! -f "$cg_outfile" ]]; then
+      echo "Linking failed! No call graph generated."
+      return 1
+    fi
+    echo "Linking failed but call graph was generated."
+  fi
+
+  if [[ $regenerate_gt -eq 1 ]]; then
+   echo "Using $cg_outfile as new ground truth"
+   cp "$cg_outfile" "$cg_gtfile"
+   return 0
+  fi
+
+  # LLVM versions 19+ emit _ZdlPvm, while versions before that use _ZdlPv instead.
+  # For consistency, we change all instances to _ZdlPvm.
+  sed -i 's/_ZdlPv\"/_ZdlPvm\"/g' "$cg_outfile"
+
+  "$cgdiff" --ignore-md --ignore-edge-md "$cg_outfile" "$cg_gtfile" -o "$diff_file" -- >>log/testrun.log 2>&1
+  fail=$?
+
+  if [[ $fail -ne 0 ]]; then
+    echo "Test failed! See $diff_file for diff."
+    return 1
+  fi
+
+  return 0
+}
+
+function runSingleFileTests {
+  suiteName=$1
+  suitePath=$2
+  variant=$3
+  addOptions=$4
+  addFlags=$5
+  regenerateGt=$6
+
+  if [[ ! $suiteName =~ $suite_pattern ]]; then
+    echo "Skipping test suite '$suiteName'..."
+    return 0
+  fi
+
+  echo " --- Running single file tests: $suiteName ---"
+  testGlob="$suitePath/*.cpp"
+  fails=0
+  for tc in ${testGlob}; do
+    echo "Running test ${tc}"
+    tname=$(basename $tc)
+    tname=${tname%.*}
+    runTestCase $tname "$suitePath" "$variant" "$addOptions" "$addFlags" $regenerateGt
+    fail=$?
+    fails=$((fails + fail))
+  done
+  echo "Failures in single file test suite '$suiteName': $fails"
+  return $fails
+}
+
+function runMultiFileTests {
+  suiteName=$1
+  suitePath=$2
+  variant=$3
+  addOptions=$4
+  addFlags=$5
+  regenerateGt=$6
+
+  if [[ ! $suiteName =~ $suite_pattern ]]; then
+    echo "Skipping test suite '$suiteName'..."
+    return 0
+  fi
+
+  echo -e "\n --- Running multi file tests: $suiteName ---"
+  multiTests=""
+  for f in $suitePath/*.cpp; do
+    ff=$(basename $f)
+    ff="${ff%%_*}"
+    multiTests="$multiTests\n$ff"
+  done
+  fails=0
+  for tc in $(echo -e $multiTests | uniq); do
+    echo "Running test ${tc}"
+    runTestCase "$tc" "$suitePath" "$variant" "$addOptions" "$addFlags" $regenerateGt
+    fail=$?
+    fails=$((fails + fail))
+  done
+  echo "Failures in multi file test suite '$suiteName': $fails"
+  return $fails
+}
+
+while getopts ":hvrs:" opt; do
+  case $opt in
+    h)
+      echo "use -h to print this help"
+      exit 0
+      ;;
+    v)
+      verbose=1
+      ;;
+    r)
+      regenerate_gt=1
+      ;;
+    s)
+      suite_pattern=$OPTARG
+      ;;
+    \?)
+      echo "Invalid option -$OPTARG"
+      exit 1
+      ;;
+  esac
+done
+
+if [[ $regenerate_gt -eq 1 ]]; then
+  echo "Warning: you have chosen to regenerate the groundtruth files."
+
+  read -p "Do you wish to continue? [yN]" yn
+  case $yn in
+    [Yy]* ) ;;
+    * ) echo "Aborting."; exit 1;;
+  esac
+fi
+
+total_fails=0
+
+# Default variant
+runSingleFileTests "basic" "$test_src_dir/input/singleTU" "" "" "" $regenerate_gt
+fails=$?
+total_fails=$((total_fails + fails))
+
+runSingleFileTests "virtual-calls" "$test_src_dir/input/virtualCalls" "" ""  "" $regenerate_gt
+fails=$?
+total_fails=$((total_fails + fails))
+
+runMultiFileTests "basic-multi" "$test_src_dir/input/multiTU" "" "" "" $regenerate_gt
+fails=$?
+total_fails=$((total_fails + fails))
+
+# PTA set to 'signature'
+runSingleFileTests "basic-pta-by-signature" "$test_src_dir/input/singleTU" "pta-signature" "--cage-pass-option -pta=signature" "" $regenerate_gt
+fails=$?
+total_fails=$((total_fails + fails))
+
+echo -e "---"
+echo -e "\n$total_fails test failures occurred"
+exit $total_fails
diff --git a/utils/config/CMakeLists.txt b/utils/config/CMakeLists.txt
index ccf3f1b6..094f57f6 100644
--- a/utils/config/CMakeLists.txt
+++ b/utils/config/CMakeLists.txt
@@ -1,6 +1,47 @@
-add_executable(metacg-config MCGConfig.cpp)
-add_config_include(metacg-config)
-target_compile_definitions(metacg-config PRIVATE INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
-add_cxxopts(metacg-config)
+function(add_mcgconfig target)
+  cmake_parse_arguments(
+    ARG
+    ""
+    ""
+    "DEFINITIONS"
+    ${ARGN}
+  )
+
+  add_executable(${target} MCGConfig.cpp)
+  add_config_include(${target})
+  add_cxxopts(${target})
+  target_compile_definitions(${target} PRIVATE INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}" ${ARG_DEFINITIONS})
+endfunction()
+
+# Build two versions of metacg-config: one to use inside the build tree (e.g. for tests) and one for the install tree,
+# to be used by external tools.
+set(MCGCONFIG_BUILD_DEFS "")
+set(MCGCONFIG_INSTALL_DEFS "")
+
+if(${BUILD_CAGE})
+  list(
+    APPEND
+    MCGCONFIG_BUILD_DEFS
+    HAVE_CAGE
+    CAGE_PLUGIN="$<TARGET_FILE:cage-plugin>"
+  )
+  list(
+    APPEND
+    MCGCONFIG_INSTALL_DEFS
+    HAVE_CAGE
+    CAGE_PLUGIN="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/$<TARGET_FILE_NAME:cage-plugin>"
+  )
+endif()
+
+add_mcgconfig(
+  metacg-build-config
+  DEFINITIONS
+  ${MCGCONFIG_BUILD_DEFS}
+)
+add_mcgconfig(
+  metacg-config
+  DEFINITIONS
+  ${MCGCONFIG_INSTALL_DEFS}
+)
 
 install(TARGETS metacg-config DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/utils/config/MCGConfig.cpp b/utils/config/MCGConfig.cpp
index fddb16d1..cba72397 100644
--- a/utils/config/MCGConfig.cpp
+++ b/utils/config/MCGConfig.cpp
@@ -9,11 +9,23 @@
 
 #include "cxxopts.hpp"
 
+// Setting default to prevent build errors when graph tools are not available.
+#ifndef CAGE_PLUGIN
+#define CAGE_PLUGIN
+#endif
+
 int main(int argc, char** argv) {
   cxxopts::Options options("metacg-config", "MetaCG configuration tool");
-  options.add_options("commands")("v,version", "Prints the version of this MetaCG installation")(
+  // clang-format off
+  options.add_options("commands")("v,version", "Prints the version of this MetaCG installation.")(
       "revision", "Prints the revision hash of this MetaCG installation")(
-      "prefix", "Prints the installation prefix of this MetaCG installation.")("h,help", "Print help");
+      "prefix", "Prints the installation prefix of this MetaCG installation.")(
+      "cage-ldflags", "Prints the necessary ld flags.")(
+      "cage-cflags", "Prints the necessary C compile flags.")(
+      "cage-cxxflags", "Prints the necessary C++ compile flags.")(
+      "cage-pass-option", "Sets a pass option", cxxopts::value<std::vector<std::string>>())(
+      "h,help", "Print help");
+  // clang-format on
 
   const cxxopts::ParseResult result = options.parse(argc, argv);
 
@@ -22,8 +34,18 @@ int main(int argc, char** argv) {
     return EXIT_SUCCESS;
   }
 
+  bool cageOptionSet = result.count("cage-ldflags") + result.count("cage-cflags") + result.count("cage-cxxflags") +
+                       result.count("cage-pass-option");
+
+#ifndef HAVE_CAGE
+  if (cageOptionSet) {
+    std::cerr << "CaGe is currently not available. Configure with -DMETACG_BUILD_GRAPH_TOOLS to build it.\n";
+    return EXIT_FAILURE;
+  }
+#endif
+
   // Exactly one of these is allowed at the same time
-  int optCount = result.count("version") + result.count("revision") + result.count("prefix");
+  int optCount = result.count("version") + result.count("revision") + result.count("prefix") + (cageOptionSet ? 1 : 0);
   if (optCount == 0) {
     std::cerr << "Error: No command specified.\n";
     return EXIT_FAILURE;
@@ -46,5 +68,29 @@ int main(int argc, char** argv) {
     return EXIT_SUCCESS;
   }
 
+#ifdef HAVE_CAGE
+  std::stringstream passOptsStream;
+  if (result.count("cage-pass-option")) {
+    const auto& passOpts = result["cage-pass-option"].as<std::vector<std::string>>();
+    for (auto& opt : passOpts) {
+      passOptsStream << " -Wl,-mllvm=" << opt << " ";
+    }
+  }
+  std::string processedPassOpts = passOptsStream.str();
+
+  if (result.contains("cage-cflags")) {
+    std::cout << " -flto ";
+  }
+
+  if (result.contains("cage-cxxflags")) {
+    std::cout << " -flto ";
+  }
+
+  if (result.contains("cage-ldflags")) {
+    std::cout << " -flto -fuse-ld=lld -Wl,-mllvm=-load=" << CAGE_PLUGIN << " -Wl,--load-pass-plugin=" << CAGE_PLUGIN
+              << processedPassOpts << " ";
+  }
+#endif
+
   return EXIT_SUCCESS;
 }