diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Basic/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Basic/check
index fa1d6cd3f..604083026 100755
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Basic/check
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Basic/check
@@ -1,21 +1,18 @@
 #!/bin/sh -e
 
-fpp_to_cpp=../../../../../../bin/fpp-to-cpp
-fprime_gcc=../../../../../../scripts/fprime-gcc
-
 echo '  removing old files'
 ./clean
 
-dir=`cd ../..; echo $PWD`
-
 echo '  generating C++'
-$fpp_to_cpp -p $dir -i ../../builtin.fpp ../../basic.fpp
-
-for suffix in hpp cpp
-do
-  cp ../../BasicTopologyAc.ref.$suffix BasicTopologyAc.$suffix
-done
+(
+  cd ../..;
+  fpp_to_cpp=../../../../bin/fpp-to-cpp
+  fprime_dir=../fprime
+  $fpp_to_cpp -p $PWD -i $fprime_dir/config/FpConfig.fpp,$fprime_dir/Platform/PlatformTypes.fpp,$fprime_dir/Fw/Prm/Prm.fpp,phases.fpp \
+    $fprime_dir/Fw/Cmd/Cmd.fpp -d check-cpp-dir/Basic basic.fpp
+)
 
+fprime_gcc=../../../../../../scripts/fprime-gcc
 flags="-I.. -I../../../fprime -I../../../fprime/config -Wno-unused-parameter -c"
 echo '  compiling C++'
 for variable_flags in '' '-DFW_DIRECT_PORT_CALLS'
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check
index 30fb806b2..de941ee15 100755
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Commands/check
@@ -1,22 +1,18 @@
 #!/bin/sh -e
 
-fpp_to_cpp=../../../../../../bin/fpp-to-cpp
-fprime_gcc=../../../../../../scripts/fprime-gcc
-
 echo '  removing old files'
 ./clean
 
-dir=`cd ../..; echo $PWD`
-fprime_dir=../../../fprime
-
 echo '  generating C++'
-$fpp_to_cpp -p $dir -i $fprime_dir/config/FpConfig.fpp,$fprime_dir/Platform/PlatformTypes.fpp,$fprime_dir/Fw/Prm/Prm.fpp,../../phases.fpp \
-  $fprime_dir/Fw/Cmd/Cmd.fpp ../../commands.fpp
-for suffix in hpp cpp
-do
-  cp ../../CommandsTopologyAc.ref.$suffix CommandsTopologyAc.$suffix
-done
+(
+  cd ../..;
+  fpp_to_cpp=../../../../bin/fpp-to-cpp
+  fprime_dir=../fprime
+  $fpp_to_cpp -p $PWD -i $fprime_dir/config/FpConfig.fpp,$fprime_dir/Platform/PlatformTypes.fpp,$fprime_dir/Fw/Prm/Prm.fpp,phases.fpp \
+    $fprime_dir/Fw/Cmd/Cmd.fpp -d check-cpp-dir/Commands commands.fpp
+)
 
+fprime_gcc=../../../../../../scripts/fprime-gcc
 flags="-I.. -I../../../fprime -I../../../fprime/config -Wno-unused-parameter -c"
 echo '  compiling C++'
 for variable_flags in '' '-DFW_DIRECT_PORT_CALLS'
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/check
index b56085039..84889ec7f 100755
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/check
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Health/check
@@ -1,23 +1,20 @@
 #!/bin/sh -e
 
-fpp_to_cpp=../../../../../../bin/fpp-to-cpp
-fprime_gcc=../../../../../../scripts/fprime-gcc
-
 echo '  removing old files'
 ./clean
 
-dir=`cd ../..; echo $PWD`
-
 echo '  generating C++'
-$fpp_to_cpp -p $dir -i ../../builtin.fpp ../../health.fpp
+(
+  cd ../..;
+  fpp_to_cpp=../../../../bin/fpp-to-cpp
+  fprime_dir=../fprime
+  $fpp_to_cpp -p $PWD -i $fprime_dir/config/FpConfig.fpp,$fprime_dir/Platform/PlatformTypes.fpp,$fprime_dir/Fw/Prm/Prm.fpp,phases.fpp \
+    $fprime_dir/Fw/Cmd/Cmd.fpp -d check-cpp-dir/Health health.fpp
+)
 
-for suffix in hpp cpp
-do
-  cp ../../HealthTopologyAc.ref.$suffix HealthTopologyAc.$suffix
-done
-
-echo '  compiling C++'
+fprime_gcc=../../../../../../scripts/fprime-gcc
 flags="-I.. -I../../../fprime -I../../../fprime/config -Wno-unused-parameter -c"
+echo '  compiling C++'
 for variable_flags in '' '-DFW_DIRECT_PORT_CALLS'
 do
   echo "    variable_flags=$variable_flags"
diff --git a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check
index a215cf878..f3f146739 100755
--- a/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check
+++ b/compiler/tools/fpp-to-cpp/test/top/check-cpp-dir/Params/check
@@ -1,23 +1,18 @@
 #!/bin/sh -e
 
-fpp_to_cpp=../../../../../../bin/fpp-to-cpp
-fprime_gcc=../../../../../../scripts/fprime-gcc
-
 echo '  removing old files'
 ./clean
 
-dir=`cd ../..; echo $PWD`
-fprime_dir=../../../fprime
-
 echo '  generating C++'
-$fpp_to_cpp -p $dir -i $fprime_dir/config/FpConfig.fpp,$fprime_dir/Platform/PlatformTypes.fpp,$fprime_dir/Fw/Prm/Prm.fpp,../../phases.fpp \
-  $fprime_dir/Fw/Cmd/Cmd.fpp ../../params.fpp
-for suffix in hpp cpp
-do
-  cp ../../ParamsTopologyAc.ref.$suffix ParamsTopologyAc.$suffix
-done
+(
+  cd ../..;
+  fpp_to_cpp=../../../../bin/fpp-to-cpp
+  fprime_dir=../fprime
+  $fpp_to_cpp -p $PWD -i $fprime_dir/config/FpConfig.fpp,$fprime_dir/Platform/PlatformTypes.fpp,$fprime_dir/Fw/Prm/Prm.fpp,phases.fpp \
+    $fprime_dir/Fw/Cmd/Cmd.fpp -d check-cpp-dir/Params params.fpp
+)
 
-echo '  compiling C++'
+fprime_gcc=../../../../../../scripts/fprime-gcc
 flags="-I.. -I../../../fprime -I../../../fprime/config -Wno-unused-parameter -c"
 echo '  compiling C++'
 for variable_flags in '' '-DFW_DIRECT_PORT_CALLS'