diff --git a/README.md b/README.md
index 5609b77..1acf1ee 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,8 @@ pip install fprime-tools
 ```
 
 Issues for these tools should be reported here: [File an issue](https://github.com/nasa/fprime/issues/new/choose)
-See also: https://nasa.github.io/fprime to see the F´ framework.
+
+See also: https://fprime.jpl.nasa.gov to see the F´ framework.
 
 ## Developer Installation
 
diff --git a/src/fprime/cookiecutter_templates/cookiecutter-fprime-component/{{cookiecutter.component_name}}/CMakeLists.txt b/src/fprime/cookiecutter_templates/cookiecutter-fprime-component/{{cookiecutter.component_name}}/CMakeLists.txt
index c16d632..581ad44 100644
--- a/src/fprime/cookiecutter_templates/cookiecutter-fprime-component/{{cookiecutter.component_name}}/CMakeLists.txt
+++ b/src/fprime/cookiecutter_templates/cookiecutter-fprime-component/{{cookiecutter.component_name}}/CMakeLists.txt
@@ -6,7 +6,7 @@
 # UT_SOURCE_FILES: list of source files for unit tests
 #
 # More information in the F´ CMake API documentation:
-# https://nasa.github.io/fprime/UsersGuide/api/cmake/API.html
+# https://fprime.jpl.nasa.gov/latest/documentation/reference
 #
 ####
 
@@ -28,3 +28,16 @@ set(SOURCE_FILES
 # )
 
 register_fprime_module()
+
+
+### Unit Tests ###
+# set(UT_SOURCE_FILES
+#   "${CMAKE_CURRENT_LIST_DIR}/{{cookiecutter.component_name}}.fpp"
+#   "${CMAKE_CURRENT_LIST_DIR}/test/ut/{{cookiecutter.component_name}}TestMain.cpp"
+#   "${CMAKE_CURRENT_LIST_DIR}/test/ut/{{cookiecutter.component_name}}Tester.cpp"
+# )
+# set(UT_MOD_DEPS
+#   STest
+# )
+# set(UT_AUTO_HELPERS ON)
+# register_fprime_ut()
diff --git a/src/fprime/cookiecutter_templates/cookiecutter-fprime-module/{{cookiecutter.module_name}}/CMakeLists.txt b/src/fprime/cookiecutter_templates/cookiecutter-fprime-module/{{cookiecutter.module_name}}/CMakeLists.txt
index 519f22f..c962765 100644
--- a/src/fprime/cookiecutter_templates/cookiecutter-fprime-module/{{cookiecutter.module_name}}/CMakeLists.txt
+++ b/src/fprime/cookiecutter_templates/cookiecutter-fprime-module/{{cookiecutter.module_name}}/CMakeLists.txt
@@ -6,8 +6,7 @@
 # UT_SOURCE_FILES: list of source files for unit tests
 #
 # More information in the F´ CMake API documentation:
-# https://nasa.github.io/fprime/UsersGuide/api/cmake/API.html
-#
+# https://fprime.jpl.nasa.gov/latest/documentation/reference/
 ####
 
 set(SOURCE_FILES