diff --git a/.github/workflows/deploy-on-release.yml b/.github/workflows/deploy-on-release.yml
index 7697388d0a..fd9f382840 100644
--- a/.github/workflows/deploy-on-release.yml
+++ b/.github/workflows/deploy-on-release.yml
@@ -345,8 +345,8 @@ jobs:
           CIBW_TEST_SKIP: "*_arm64"
           CIBW_BEFORE_ALL_LINUX: yum install -y libxml2-devel || (apk add libxml2-dev && rm /usr/lib/cmake/libxml2/libxml2-config.cmake)
           CIBW_BEFORE_ALL_WINDOWS: cd src/bindings/python && cmake -S wheel_dependencies -B build-wheel_dependencies -G Ninja && cd build-wheel_dependencies && ninja
-          CIBW_ENVIRONMENT: LIBCELLML_VERSION_TAG=${{ steps.setup.outputs.tag }}
-          CIBW_ENVIRONMENT_MACOS: >
+          CIBW_ENVIRONMENT: >
+            LIBCELLML_VERSION_TAG=${{ steps.setup.outputs.tag }}
             MACOSX_DEPLOYMENT_TARGET=${{ steps.setup.outputs.macos_deployment_target }}
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: ""
           CIBW_BEFORE_BUILD_LINUX: pip install renamewheel
@@ -364,14 +364,14 @@ jobs:
 
       - name: Publish Python wheels
         if: needs.setup-jobs.outputs.binaries-destination == 'Publish'
-        shell: bash
         env:
-          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        run: |
-          python -m pip install twine
-          twine upload --skip-existing ./wheelhouse/*.whl
-
+          name: pypi
+          url: https://pypi.org/p/libcellml
+        permissions:
+          id-token: write
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: ./wheelhouse/
 
   emscripten:
     needs: setup-jobs
@@ -446,9 +446,7 @@ jobs:
 
       - name: Publish libcellml.js
         if: needs.setup-jobs.outputs.binaries-destination == 'Publish'
-        shell: bash
-        env:
-          NPM_TOKEN: ${{secrets.NPM_TOKEN}}
-        run: |
-          cd build-libcellml-release/src/bindings/javascript
-          npm publish --access public
+        uses: JS-DevTools/npm-publish@v3
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          package: build-libcellml-release/src/bindings/javascript
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d44995ad1a..464396feb9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,8 +18,8 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Minimum OS X deployment vers
 
 set(PROJECT_NAME libCellML)
 set(PROJECT_URL https://libcellml.org)
-set(_PROJECT_VERSION 0.6.0)
-set(PROJECT_DEVELOPER_VERSION )
+set(_PROJECT_VERSION 0.6.1)
+set(PROJECT_DEVELOPER_VERSION -rc.1)
 project(${PROJECT_NAME} VERSION ${_PROJECT_VERSION} LANGUAGES CXX)
 
 # Set policies that affect the build.
diff --git a/cmake/TestLibXml2ConstErrorStructuredErrorCallback.cmake b/cmake/TestLibXml2ConstErrorStructuredErrorCallback.cmake
new file mode 100644
index 0000000000..135cffa32e
--- /dev/null
+++ b/cmake/TestLibXml2ConstErrorStructuredErrorCallback.cmake
@@ -0,0 +1,88 @@
+# Function: Test_LibXml2_Const_Error_Structured_Error_Callback
+#
+# Test if LibXml2 uses const Error * for structured error callback function.
+#
+# CONST_ERROR_STRUCTURED_ERROR_CALLBACK - true if const Error * is required
+# for structuredErrorCallback.
+#
+
+function(Test_LibXml2_Const_Error_Structured_Error_Callback)
+  set(_VAR_NAME "CONST_ERROR_STRUCTURED_ERROR_CALLBACK")
+  set(_HASH_VAR_NAME "HASH_${_VAR_NAME}")
+
+  # Hash the CMAKE_FLAGS passed and check cache to know if we need to rerun.
+  string(MD5 _CMAKE_FLAGS_HASH "${CMAKE_SHARED_LINKER_FLAGS}")
+
+  if(NOT DEFINED "${_HASH_VAR_NAME}")
+    unset("${_VAR_NAME}" CACHE)
+  elseif(NOT "${${_HASH_VAR_NAME}}" STREQUAL "${_CMAKE_FLAGS_HASH}")
+    unset("${_VAR_NAME}" CACHE)
+  endif()
+
+  if(NOT DEFINED "${_VAR_NAME}")
+    message(STATUS "Performing Test ${_VAR_NAME} - ...")
+    set(_TEST_PROJECT_DIR "${PROJECT_BINARY_DIR}/CMakeTmp/${_VAR_NAME}")
+
+    file(WRITE "${_TEST_PROJECT_DIR}/CMakeLists.txt"
+"
+cmake_minimum_required(VERSION 3.18.0)
+project(undefined CXX)
+add_library(foo SHARED \"foo.cpp\")
+")
+    if(HAVE_LIBXML2_CONFIG)
+      file(APPEND "${_TEST_PROJECT_DIR}/CMakeLists.txt"
+"
+set(LibXml2_DIR \"${LibXml2_DIR}\")
+find_package(LibXml2 CONFIG)
+target_link_libraries(foo PUBLIC ${LIBXML2_TARGET_NAME})
+")
+    else()
+      file(APPEND "${_TEST_PROJECT_DIR}/CMakeLists.txt"
+"
+find_package(LibXml2)
+target_include_directories(foo PUBLIC ${LIBXML2_INCLUDE_DIR})
+target_link_libraries(foo PUBLIC ${LIBXML2_LIBRARIES})
+target_compile_definitions(foo PUBLIC ${LIBXML2_DEFINITIONS})
+")
+    endif()
+
+    file(WRITE "${_TEST_PROJECT_DIR}/foo.cpp"
+"
+#include <libxml/tree.h>
+#include <libxml/xmlerror.h>
+
+void structuredErrorCallback(void *userData, const xmlError *error)
+{
+}
+
+void function()
+{
+    xmlInitParser();
+    xmlParserCtxtPtr context = xmlNewParserCtxt();
+    xmlSetStructuredErrorFunc(context, structuredErrorCallback);
+    xmlFreeParserCtxt(context);
+    xmlSetStructuredErrorFunc(nullptr, nullptr);
+    xmlCleanupParser();
+}
+")
+
+    try_compile(${_VAR_NAME}
+      "${_TEST_PROJECT_DIR}"
+      "${_TEST_PROJECT_DIR}"
+      undefined
+      CMAKE_FLAGS
+        "-DCMAKE_SHARED_LINKER_FLAGS='${CMAKE_SHARED_LINKER_FLAGS}'"
+      OUTPUT_VARIABLE _OUTPUT)
+
+    set(${_HASH_VAR_NAME} "${_CMAKE_FLAGS_HASH}" CACHE INTERNAL  "Hashed try_compile flags.")
+
+    if(${_VAR_NAME})
+      message(STATUS "Performing Test ${_VAR_NAME} - Success")
+    else()
+      message(STATUS "Performing Test ${_VAR_NAME} - Failed")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+        "Performing Test ${_VAR_NAME} failed with the following output:\n"
+        "${_OUTPUT}\n")
+    endif()
+  endif()
+endfunction()
diff --git a/cmake/TestUndefinedSymbolsAllowed.cmake b/cmake/TestUndefinedSymbolsAllowed.cmake
index 5f02ca7fca..6b9668ac28 100644
--- a/cmake/TestUndefinedSymbolsAllowed.cmake
+++ b/cmake/TestUndefinedSymbolsAllowed.cmake
@@ -3,35 +3,34 @@
 # Test if the linker allows undefined symbols for shared libraries.
 #
 # UNDEFINED_SYMBOLS_ALLOWED - true if the linker will allow
-#   undefined symbols for shared libraries
+#   undefined symbols for shared libraries.
 #
 
 function(Test_Undefined_Symbols_Allowed)
-
   set(_VAR_NAME "UNDEFINED_SYMBOLS_ALLOWED")
   set(_HASH_VAR_NAME "HASH_${_VAR_NAME}")
 
-  # hash the CMAKE_FLAGS passed and check cache to know if we need to rerun
-  string(MD5 cmake_flags_hash "${CMAKE_SHARED_LINKER_FLAGS}")
+  # Hash the CMAKE_FLAGS passed and check cache to know if we need to rerun.
+  string(MD5 _CMAKE_FLAGS_HASH "${CMAKE_SHARED_LINKER_FLAGS}")
 
   if(NOT DEFINED "${_HASH_VAR_NAME}")
     unset("${_VAR_NAME}" CACHE)
-  elseif(NOT "${${_HASH_VAR_NAME}}" STREQUAL "${cmake_flags_hash}")
+  elseif(NOT "${${_HASH_VAR_NAME}}" STREQUAL "${_CMAKE_FLAGS_HASH}")
     unset("${_VAR_NAME}" CACHE)
   endif()
 
   if(NOT DEFINED "${_VAR_NAME}")
     message(STATUS "Performing Test ${_VAR_NAME} - ...")
-    set(test_project_dir "${PROJECT_BINARY_DIR}/CMakeTmp/${_VAR_NAME}")
+    set(_TEST_PROJECT_DIR "${PROJECT_BINARY_DIR}/CMakeTmp/${_VAR_NAME}")
 
-    file(WRITE "${test_project_dir}/CMakeLists.txt"
+    file(WRITE "${_TEST_PROJECT_DIR}/CMakeLists.txt"
 "
 cmake_minimum_required(VERSION 3.18.0)
 project(undefined CXX)
 add_library(foo SHARED \"foo.cpp\")
 ")
 
-    file(WRITE "${test_project_dir}/foo.cpp"
+    file(WRITE "${_TEST_PROJECT_DIR}/foo.cpp"
 "
 extern int bar(void);
 int foo(void) {return bar()+1;}
@@ -44,15 +43,15 @@ int foo(void) {return bar()+1;}
     endif()
 
     try_compile(${_VAR_NAME}
-      "${test_project_dir}"
-      "${test_project_dir}"
+      "${_TEST_PROJECT_DIR}"
+      "${_TEST_PROJECT_DIR}"
       undefined
       CMAKE_FLAGS
         "-DCMAKE_SHARED_LINKER_FLAGS='${CMAKE_SHARED_LINKER_FLAGS}'"
         ${_rpath_arg}
-      OUTPUT_ _VAR_NAME output)
+      OUTPUT_VARIABLE _OUTPUT)
 
-    set(${_HASH_VAR_NAME} "${cmake_flags_hash}" CACHE INTERNAL  "hashed try_compile flags")
+    set(${_HASH_VAR_NAME} "${_CMAKE_FLAGS_HASH}" CACHE INTERNAL  "hashed try_compile flags")
 
     if(${_VAR_NAME})
       message(STATUS "Performing Test ${_VAR_NAME} - Success")
@@ -60,7 +59,7 @@ int foo(void) {return bar()+1;}
       message(STATUS "Performing Test ${_VAR_NAME} - Failed")
       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
         "Performing Test ${_VAR_NAME} failed with the following output:\n"
-        "${OUTPUT}\n")
+        "${_OUTPUT}\n")
     endif()
   endif()
 endfunction()
diff --git a/cmake/environmentchecks.cmake b/cmake/environmentchecks.cmake
index 071e33682c..27e4f73d32 100644
--- a/cmake/environmentchecks.cmake
+++ b/cmake/environmentchecks.cmake
@@ -14,6 +14,7 @@
 
 include(CheckCXXCompilerFlag)
 include(TestUndefinedSymbolsAllowed)
+include(TestLibXml2ConstErrorStructuredErrorCallback)
 
 get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
@@ -130,6 +131,7 @@ if(LibXml2_FOUND)
       endif()
     else()
       find_package(ZLIB REQUIRED)
+      set(_ZLIB_FIND_REPORTED TRUE CACHE INTERNAL "Flag for reporting on what ZLIB was found.")
     endif()
   endif()
   set(HAVE_LIBXML2_CONFIG TRUE)
@@ -154,11 +156,13 @@ if(LibXml2_FOUND)
   endforeach()
 else()
   find_package(LibXml2 REQUIRED)
+  set(_LibXml2_FIND_REPORTED TRUE CACHE INTERNAL "Flag for reporting on what LibXml2 was found.")
   if(TARGET z)
     set(HAVE_ZLIB_TARGET TRUE)
     get_target_property(ZLIB_TARGET_TYPE z TYPE)
   else()
     find_package(ZLIB REQUIRED)
+    set(_ZLIB_FIND_REPORTED TRUE CACHE INTERNAL "Flag for reporting on what ZLIB was found.")
   endif()
   if(LibXml2_FOUND)
     # Clear out GUI variable created in config search mode.
@@ -166,6 +170,19 @@ else()
   endif()
 endif()
 
+if(NOT DEFINED _LibXml2_FIND_REPORTED)
+  set(_LibXml2_FIND_REPORTED TRUE CACHE INTERNAL "Flag for reporting on what LibXml2 was found.")
+  message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES} (found version \"${LIBXML2_VERSION_STRING}\").")
+endif()
+
+if(NOT DEFINED _ZLIB_FIND_REPORTED)
+  set(_ZLIB_FIND_REPORTED TRUE CACHE INTERNAL "Flag for reporting on what ZLIB was found.")
+  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.26)
+    set(ZLIB_VERSION_STRING ${ZLIB_VERSION})
+  endif()
+  message(STATUS "Found ZLIB: ${ZLIB_LIBRARIES} (found version \"${ZLIB_VERSION_STRING}\").")
+endif()
+
 if(BUILDCACHE_EXE OR CLCACHE_EXE OR CCACHE_EXE)
   set(COMPILER_CACHE_AVAILABLE TRUE CACHE INTERNAL "Executable required to cache compilations.")
 endif()
@@ -238,3 +255,11 @@ endif()
 if(EMSCRIPTEN AND NODE_EXE AND NPM_EXE)
     set(JAVASCRIPT_BINDINGS_TESTING_AVAILABLE TRUE CACHE INTERNAL "Executables required to run the javascript bindings tests are available.")
 endif()
+
+test_libxml2_const_error_structured_error_callback()
+
+if(CONST_ERROR_STRUCTURED_ERROR_CALLBACK)
+  set(CONST_ERROR_STRUCTURED_ERROR_CALLBACK_TYPE "const xmlError *")
+else()
+  set(CONST_ERROR_STRUCTURED_ERROR_CALLBACK_TYPE "xmlErrorPtr")
+endif()
diff --git a/docs/changelogs/changelog_v0.6.1-rc.1.rst b/docs/changelogs/changelog_v0.6.1-rc.1.rst
new file mode 100644
index 0000000000..081e5e5e5f
--- /dev/null
+++ b/docs/changelogs/changelog_v0.6.1-rc.1.rst
@@ -0,0 +1,16 @@
+libCellML v0.6.1-rc.1 Changelog
+===============================
+
+Infrastructure
+--------------
+
+* Add a test to check what type is used in the LibXml2 structuredErrorCallback function by `@hsorby <https://github.com/hsorby>`_ [`#1274 <https://github.com/cellml/libcellml/pull/1274>`_].
+* Deploy updates by `@hsorby <https://github.com/hsorby>`_ [`#1273 <https://github.com/cellml/libcellml/pull/1273>`_].
+
+Contributors
+------------
+
+.. image:: https://avatars.githubusercontent.com/u/778048?v=4
+   :target: https://github.com/hsorby
+   :height: 32
+   :width: 32
diff --git a/docs/changelogs/index.rst b/docs/changelogs/index.rst
index 333664acf7..5794e93839 100644
--- a/docs/changelogs/index.rst
+++ b/docs/changelogs/index.rst
@@ -4,6 +4,7 @@ Changelogs
 
 .. toctree::
 
+   changelog_v0.6.1-rc.1
    changelog_v0.6.0
    changelog_v0.5.0
    changelog_v0.4.0
diff --git a/docs/index.rst b/docs/index.rst
index 04a49c7496..d31147a0b5 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -39,6 +39,7 @@ Changelogs
 
 .. toctree::
 
+   changelogs/changelog_v0.6.1-rc.1
    changelogs/changelog_v0.6.0
    changelogs/changelog_v0.5.0
    changelogs/changelog_v0.4.0
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 30a60d5bc6..b790b2198f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -173,6 +173,9 @@ add_library(cellml
   ${API_HEADER_FILES}
 )
 
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/xmldoc.cpp PROPERTIES
+  COMPILE_DEFINITIONS XML_ERROR_CALLBACK_ARGUMENT_TYPE=${CONST_ERROR_STRUCTURED_ERROR_CALLBACK_TYPE})
+
 generate_export_header(cellml EXPORT_FILE_NAME ${LIBCELLML_EXPORTDEFINITIONS_H} BASE_NAME LIBCELLML)
 
 target_include_directories(cellml
diff --git a/src/bindings/javascript/CMakeLists.txt b/src/bindings/javascript/CMakeLists.txt
index 86e79547fa..9fdd3e1791 100644
--- a/src/bindings/javascript/CMakeLists.txt
+++ b/src/bindings/javascript/CMakeLists.txt
@@ -71,13 +71,12 @@ set(_PACKAGE_JSON "\{
   \"version\": \"${PROJECT_VERSION}${PROJECT_DEVELOPER_VERSION}\",
   \"repository\": \{
     \"type\": \"git\",
-    \"url\": \"https://github.com/cellml/libcellml.git\"
+    \"url\": \"git+https://github.com/cellml/libcellml.git\"
   },
   \"description\": \"libcellml.js javascript web assembly for libCellML.\",
   \"main\": \"libcellml.js\",
   \"files\": [\"libcellml.common.js\", \"libcellml.common.wasm\", \"libcellml.js\", \"libcellml.wasm\", \"README.md\", \"vue-app-with-libcellml.png\"],
   \"author\": \"libCellML Developers <developers@libcellml.org>\",
-  \"repository\": \"https://github.com/cellml/libcellml\",
   \"license\": \"Apache-2.0\"
 }
 ")
diff --git a/src/xmldoc.cpp b/src/xmldoc.cpp
index d1774dac7a..24709be463 100644
--- a/src/xmldoc.cpp
+++ b/src/xmldoc.cpp
@@ -42,7 +42,7 @@ namespace libcellml {
  *
  * @param error The @c xmlErrorPtr to the error raised by libxml.
  */
-void structuredErrorCallback(void *userData, xmlErrorPtr error)
+void structuredErrorCallback(void *userData, XML_ERROR_CALLBACK_ARGUMENT_TYPE error)
 {
     static const std::regex newLineRegex("\\n");
     // Swap libxml2 carriage return for a period.
diff --git a/tests/bindings/javascript/version.test.js b/tests/bindings/javascript/version.test.js
index 178e358bab..6e066ec9d6 100644
--- a/tests/bindings/javascript/version.test.js
+++ b/tests/bindings/javascript/version.test.js
@@ -22,6 +22,6 @@ describe("Version tests", () => {
     libcellml = await libCellMLModule();
   });
   test('Checking version string.', () => {
-    expect(libcellml.versionString()).toBe('0.6.0');
+    expect(libcellml.versionString()).toBe('0.6.1');
   });
 })
diff --git a/tests/parser/libxml_user.cpp b/tests/parser/libxml_user.cpp
index a8c1d24d40..ba84240c49 100644
--- a/tests/parser/libxml_user.cpp
+++ b/tests/parser/libxml_user.cpp
@@ -24,7 +24,7 @@ limitations under the License.
 
 #include <libxml/parser.h>
 
-void structuredErrorCallback(void *userData, xmlErrorPtr error)
+void structuredErrorCallback(void *userData, XML_ERROR_CALLBACK_ARGUMENT_TYPE error)
 {
     if (userData != nullptr && error != nullptr) {
         // Suppress any error messages raised from using LibXml2.
diff --git a/tests/parser/tests.cmake b/tests/parser/tests.cmake
index 2dc80546d7..7a841c870e 100644
--- a/tests/parser/tests.cmake
+++ b/tests/parser/tests.cmake
@@ -19,3 +19,6 @@ set(${CURRENT_TEST}_SRCS
 #set(${CURRENT_TEST}_HDRS
 #  ${CMAKE_CURRENT_LIST_DIR}/<test_header_files.h>
 #)
+
+set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/libxml_user.cpp PROPERTIES
+  COMPILE_DEFINITIONS XML_ERROR_CALLBACK_ARGUMENT_TYPE=${CONST_ERROR_STRUCTURED_ERROR_CALLBACK_TYPE})
diff --git a/tests/resources/coverage/generator/model.c b/tests/resources/coverage/generator/model.c
index c537d069fa..5199523342 100644
--- a/tests/resources/coverage/generator/model.c
+++ b/tests/resources/coverage/generator/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 209;
diff --git a/tests/resources/coverage/generator/model.h b/tests/resources/coverage/generator/model.h
index 9d8e94184c..a1c95a3be8 100644
--- a/tests/resources/coverage/generator/model.h
+++ b/tests/resources/coverage/generator/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/coverage/generator/model.implementation.out b/tests/resources/coverage/generator/model.implementation.out
index 6c85028643..9192abed86 100644
--- a/tests/resources/coverage/generator/model.implementation.out
+++ b/tests/resources/coverage/generator/model.implementation.out
@@ -1,4 +1,4 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.0. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.1. */
 
 double xor(double x, double y)
 {
diff --git a/tests/resources/coverage/generator/model.interface.out b/tests/resources/coverage/generator/model.interface.out
index 17842c1d65..1d3f83f624 100644
--- a/tests/resources/coverage/generator/model.interface.out
+++ b/tests/resources/coverage/generator/model.interface.out
@@ -1,4 +1,4 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.0. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/coverage/generator/model.modified.profile.c b/tests/resources/coverage/generator/model.modified.profile.c
index 88a4fede2b..b2d0f5664c 100644
--- a/tests/resources/coverage/generator/model.modified.profile.c
+++ b/tests/resources/coverage/generator/model.modified.profile.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.0. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0.post0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 209;
diff --git a/tests/resources/coverage/generator/model.modified.profile.h b/tests/resources/coverage/generator/model.modified.profile.h
index f6509bf327..418c4336a2 100644
--- a/tests/resources/coverage/generator/model.modified.profile.h
+++ b/tests/resources/coverage/generator/model.modified.profile.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.0. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/coverage/generator/model.modified.profile.py b/tests/resources/coverage/generator/model.modified.profile.py
index 49dc56a77c..b643442523 100644
--- a/tests/resources/coverage/generator/model.modified.profile.py
+++ b/tests/resources/coverage/generator/model.modified.profile.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using a modified Python profile of libCellML 0.6.0.
+# The content of this file was generated using a modified Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0.post0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 209
diff --git a/tests/resources/coverage/generator/model.out b/tests/resources/coverage/generator/model.out
index e46b733183..f473589ae1 100644
--- a/tests/resources/coverage/generator/model.out
+++ b/tests/resources/coverage/generator/model.out
@@ -1,4 +1,4 @@
-/* The content of this file was generated using a modified C profile of libCellML 0.6.0. */
+/* The content of this file was generated using a modified C profile of libCellML 0.6.1. */
 
 #include "customheaderfile.h"
 
diff --git a/tests/resources/coverage/generator/model.py b/tests/resources/coverage/generator/model.py
index e59b58a9aa..f4c31510e0 100644
--- a/tests/resources/coverage/generator/model.py
+++ b/tests/resources/coverage/generator/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 209
diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.c
index 680c6813df..5ff5e9066c 100644
--- a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.c
+++ b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 2;
 
diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.c b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.c
index c3f8a31edb..a292455ccc 100644
--- a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.c
+++ b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.external.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 2;
 
diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.h b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.h
index 1ad708919e..440e0f64a4 100644
--- a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.h
+++ b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.py b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.py
index 954dbf9e93..23433d90f4 100644
--- a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.py
+++ b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.external.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 2
 
diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.h
index a4e571d3ad..04be26564a 100644
--- a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.h
+++ b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.py
index f69e3d0495..8868366ac1 100644
--- a/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.py
+++ b/tests/resources/generator/algebraic_eqn_computed_var_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 2
 
diff --git a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.c
index 61548b6136..af283a5c3d 100644
--- a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.c
+++ b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 2;
 
diff --git a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.h
index a4e571d3ad..04be26564a 100644
--- a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.h
+++ b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.py
index 2233a67e1f..7cfc015b4a 100644
--- a/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.py
+++ b/tests/resources/generator/algebraic_eqn_const_var_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 2
 
diff --git a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.c
index 1f8b5acb40..9e7c8e67e6 100644
--- a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.c
+++ b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 1;
 
diff --git a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.h
index 75dd2ed790..8b93aac904 100644
--- a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.h
+++ b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py
index 5ac1d1e02a..f98124c0b5 100644
--- a/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py
+++ b/tests/resources/generator/algebraic_eqn_constant_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 1
 
diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.c
index e23a8eba7a..3552e4328e 100644
--- a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.c
+++ b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 2;
diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.h
index d63dc72a06..a5f58a4a81 100644
--- a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.h
+++ b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py
index fd4d449b36..a05bca8f38 100644
--- a/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py
+++ b/tests/resources/generator/algebraic_eqn_derivative_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 2
diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.c b/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.c
index 550702f11e..b9329f32b8 100644
--- a/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.c
+++ b/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 2;
diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.h b/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.h
index f1e1489ff9..4b668b8ab4 100644
--- a/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.h
+++ b/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.py b/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.py
index f1ed0b42b6..0d17cd3688 100644
--- a/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.py
+++ b/tests/resources/generator/algebraic_eqn_derivative_on_rhs_one_component/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 2
diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.c b/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.c
index c9d8e5692f..556ee1a890 100644
--- a/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.c
+++ b/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 2;
diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.h b/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.h
index cd16c62daf..a831557cc1 100644
--- a/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.h
+++ b/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.py b/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.py
index eef4ac0553..4437025f13 100644
--- a/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.py
+++ b/tests/resources/generator/algebraic_eqn_state_var_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 2
diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.c b/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.c
index 33fc476974..938e5193f8 100644
--- a/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.c
+++ b/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 2;
diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.h b/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.h
index d82daff6a5..9c53185cb7 100644
--- a/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.h
+++ b/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.py b/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.py
index d35535a821..d44ed299cc 100644
--- a/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.py
+++ b/tests/resources/generator/algebraic_eqn_state_var_on_rhs_one_component/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 2
diff --git a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.c b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.c
index da6384a599..77978ca53e 100644
--- a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.c
+++ b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 4;
 
diff --git a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.c b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.c
index 1ef331b07f..335cfe73f2 100644
--- a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.c
+++ b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.external.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 4;
 
diff --git a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.h b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.h
index 1ad708919e..440e0f64a4 100644
--- a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.h
+++ b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.py b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.py
index b115e83971..da41e70ab4 100644
--- a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.py
+++ b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.external.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 4
 
diff --git a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.h b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.h
index a4e571d3ad..04be26564a 100644
--- a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.h
+++ b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.py b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.py
index 475c6660ef..126d8b4717 100644
--- a/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.py
+++ b/tests/resources/generator/algebraic_eqn_with_one_non_isolated_unknown/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 4
 
diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.c b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.c
index e8abab717c..13d720d280 100644
--- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.c
+++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 3;
 
diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.h b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.h
index 32daa7677a..7f6315ebef 100644
--- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.h
+++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.one.external.c b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.one.external.c
index f63ffdd07e..504adb52ea 100644
--- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.one.external.c
+++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.one.external.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.one.external.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 3;
 
diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.one.external.h b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.one.external.h
index 603b8a7d53..33726d0019 100644
--- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.one.external.h
+++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.one.external.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.one.external.py b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.one.external.py
index 6db5e1b426..de8bbd9c4b 100644
--- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.one.external.py
+++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.one.external.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 3
 
diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.py b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.py
index faaea92712..5bd856be6e 100644
--- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.py
+++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 3
 
diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.three.externals.c b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.three.externals.c
index c070cc18aa..2057cc650b 100644
--- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.three.externals.c
+++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.three.externals.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.three.externals.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 3;
 
diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.three.externals.h b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.three.externals.h
index 603b8a7d53..33726d0019 100644
--- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.three.externals.h
+++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.three.externals.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.three.externals.py b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.three.externals.py
index f04da97fb8..0e40f3971d 100644
--- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.three.externals.py
+++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.three.externals.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 3
 
diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.two.externals.c b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.two.externals.c
index 36c73879c7..cde08296cb 100644
--- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.two.externals.c
+++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.two.externals.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.two.externals.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 3;
 
diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.two.externals.h b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.two.externals.h
index 603b8a7d53..33726d0019 100644
--- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.two.externals.h
+++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.two.externals.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.two.externals.py b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.two.externals.py
index d3240ff893..a84fccfda1 100644
--- a/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.two.externals.py
+++ b/tests/resources/generator/algebraic_system_with_three_linked_unknowns/model.two.externals.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 3
 
diff --git a/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.c b/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.c
index d5c33adb68..2ba435a948 100644
--- a/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.c
+++ b/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.not.ordered.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 6;
 
diff --git a/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.h b/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.h
index 32daa7677a..7f6315ebef 100644
--- a/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.h
+++ b/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.py b/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.py
index eb02b8a0b5..7cf9770cc7 100644
--- a/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.py
+++ b/tests/resources/generator/algebraic_system_with_various_dependencies/model.not.ordered.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 6
 
diff --git a/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.c b/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.c
index d7efe17849..97d3b1137a 100644
--- a/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.c
+++ b/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.ordered.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 6;
 
diff --git a/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.h b/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.h
index 32daa7677a..7f6315ebef 100644
--- a/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.h
+++ b/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.py b/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.py
index a4ba68ec6f..bae4ee2d75 100644
--- a/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.py
+++ b/tests/resources/generator/algebraic_system_with_various_dependencies/model.ordered.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 6
 
diff --git a/tests/resources/generator/algebraic_unknown_var_on_rhs/model.c b/tests/resources/generator/algebraic_unknown_var_on_rhs/model.c
index ded35a9b82..2c0f7939ae 100644
--- a/tests/resources/generator/algebraic_unknown_var_on_rhs/model.c
+++ b/tests/resources/generator/algebraic_unknown_var_on_rhs/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 2;
 
diff --git a/tests/resources/generator/algebraic_unknown_var_on_rhs/model.h b/tests/resources/generator/algebraic_unknown_var_on_rhs/model.h
index 75dd2ed790..8b93aac904 100644
--- a/tests/resources/generator/algebraic_unknown_var_on_rhs/model.h
+++ b/tests/resources/generator/algebraic_unknown_var_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/algebraic_unknown_var_on_rhs/model.py b/tests/resources/generator/algebraic_unknown_var_on_rhs/model.py
index 4d35b1e7c0..652333cc0c 100644
--- a/tests/resources/generator/algebraic_unknown_var_on_rhs/model.py
+++ b/tests/resources/generator/algebraic_unknown_var_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 2
 
diff --git a/tests/resources/generator/cell_geometry_model/model.c b/tests/resources/generator/cell_geometry_model/model.c
index f061412060..a330030c8c 100644
--- a/tests/resources/generator/cell_geometry_model/model.c
+++ b/tests/resources/generator/cell_geometry_model/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 4;
 
diff --git a/tests/resources/generator/cell_geometry_model/model.external.c b/tests/resources/generator/cell_geometry_model/model.external.c
index 9542b6f88f..631f62d051 100644
--- a/tests/resources/generator/cell_geometry_model/model.external.c
+++ b/tests/resources/generator/cell_geometry_model/model.external.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.external.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 4;
 
diff --git a/tests/resources/generator/cell_geometry_model/model.external.h b/tests/resources/generator/cell_geometry_model/model.external.h
index f9ebe340a0..2b4aaa07ed 100644
--- a/tests/resources/generator/cell_geometry_model/model.external.h
+++ b/tests/resources/generator/cell_geometry_model/model.external.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/cell_geometry_model/model.external.py b/tests/resources/generator/cell_geometry_model/model.external.py
index 3f0e72f98a..0cb0277606 100644
--- a/tests/resources/generator/cell_geometry_model/model.external.py
+++ b/tests/resources/generator/cell_geometry_model/model.external.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 4
 
diff --git a/tests/resources/generator/cell_geometry_model/model.h b/tests/resources/generator/cell_geometry_model/model.h
index b47d6ae000..71134ad88f 100644
--- a/tests/resources/generator/cell_geometry_model/model.h
+++ b/tests/resources/generator/cell_geometry_model/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/cell_geometry_model/model.py b/tests/resources/generator/cell_geometry_model/model.py
index 197a72fc2f..23e46f217a 100644
--- a/tests/resources/generator/cell_geometry_model/model.py
+++ b/tests/resources/generator/cell_geometry_model/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 4
 
diff --git a/tests/resources/generator/cellml_mappings_and_encapsulations/model.c b/tests/resources/generator/cellml_mappings_and_encapsulations/model.c
index 6a87540b96..4e5a1873a7 100644
--- a/tests/resources/generator/cellml_mappings_and_encapsulations/model.c
+++ b/tests/resources/generator/cellml_mappings_and_encapsulations/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 2;
 const size_t VARIABLE_COUNT = 2;
diff --git a/tests/resources/generator/cellml_mappings_and_encapsulations/model.h b/tests/resources/generator/cellml_mappings_and_encapsulations/model.h
index 1960d79bbb..7c6a45a811 100644
--- a/tests/resources/generator/cellml_mappings_and_encapsulations/model.h
+++ b/tests/resources/generator/cellml_mappings_and_encapsulations/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/cellml_mappings_and_encapsulations/model.py b/tests/resources/generator/cellml_mappings_and_encapsulations/model.py
index 1ed0ddf5e1..18b1a55594 100644
--- a/tests/resources/generator/cellml_mappings_and_encapsulations/model.py
+++ b/tests/resources/generator/cellml_mappings_and_encapsulations/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 2
 VARIABLE_COUNT = 2
diff --git a/tests/resources/generator/cellml_slc_example/model.py b/tests/resources/generator/cellml_slc_example/model.py
index 308d1d3027..6b937f8be8 100644
--- a/tests/resources/generator/cellml_slc_example/model.py
+++ b/tests/resources/generator/cellml_slc_example/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 10
 
diff --git a/tests/resources/generator/cellml_state_initialised_using_variable/model.c b/tests/resources/generator/cellml_state_initialised_using_variable/model.c
index 04ae033a76..75cafaad34 100644
--- a/tests/resources/generator/cellml_state_initialised_using_variable/model.c
+++ b/tests/resources/generator/cellml_state_initialised_using_variable/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 1;
diff --git a/tests/resources/generator/cellml_state_initialised_using_variable/model.h b/tests/resources/generator/cellml_state_initialised_using_variable/model.h
index 6f4c3d11bf..8f46f93b87 100644
--- a/tests/resources/generator/cellml_state_initialised_using_variable/model.h
+++ b/tests/resources/generator/cellml_state_initialised_using_variable/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/cellml_state_initialised_using_variable/model.py b/tests/resources/generator/cellml_state_initialised_using_variable/model.py
index c5c5a267db..37ff54ec89 100644
--- a/tests/resources/generator/cellml_state_initialised_using_variable/model.py
+++ b/tests/resources/generator/cellml_state_initialised_using_variable/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 1
diff --git a/tests/resources/generator/cellml_unit_scaling_constant/model.c b/tests/resources/generator/cellml_unit_scaling_constant/model.c
index 52452dab75..80b9b2b9ad 100644
--- a/tests/resources/generator/cellml_unit_scaling_constant/model.c
+++ b/tests/resources/generator/cellml_unit_scaling_constant/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 3;
 
diff --git a/tests/resources/generator/cellml_unit_scaling_constant/model.h b/tests/resources/generator/cellml_unit_scaling_constant/model.h
index bf0869677b..d758ccd544 100644
--- a/tests/resources/generator/cellml_unit_scaling_constant/model.h
+++ b/tests/resources/generator/cellml_unit_scaling_constant/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/cellml_unit_scaling_constant/model.py b/tests/resources/generator/cellml_unit_scaling_constant/model.py
index a99e9ff626..e0666ea501 100644
--- a/tests/resources/generator/cellml_unit_scaling_constant/model.py
+++ b/tests/resources/generator/cellml_unit_scaling_constant/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 3
 
diff --git a/tests/resources/generator/cellml_unit_scaling_rate/model.c b/tests/resources/generator/cellml_unit_scaling_rate/model.c
index 83fb18139d..df4a0be1f4 100644
--- a/tests/resources/generator/cellml_unit_scaling_rate/model.c
+++ b/tests/resources/generator/cellml_unit_scaling_rate/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 2;
diff --git a/tests/resources/generator/cellml_unit_scaling_rate/model.h b/tests/resources/generator/cellml_unit_scaling_rate/model.h
index 6f4c3d11bf..8f46f93b87 100644
--- a/tests/resources/generator/cellml_unit_scaling_rate/model.h
+++ b/tests/resources/generator/cellml_unit_scaling_rate/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/cellml_unit_scaling_rate/model.py b/tests/resources/generator/cellml_unit_scaling_rate/model.py
index e7ba41b796..e298de417b 100644
--- a/tests/resources/generator/cellml_unit_scaling_rate/model.py
+++ b/tests/resources/generator/cellml_unit_scaling_rate/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 2
diff --git a/tests/resources/generator/cellml_unit_scaling_state/model.c b/tests/resources/generator/cellml_unit_scaling_state/model.c
index 2af3ce880f..5260ffbde6 100644
--- a/tests/resources/generator/cellml_unit_scaling_state/model.c
+++ b/tests/resources/generator/cellml_unit_scaling_state/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 2;
diff --git a/tests/resources/generator/cellml_unit_scaling_state/model.h b/tests/resources/generator/cellml_unit_scaling_state/model.h
index 6f4c3d11bf..8f46f93b87 100644
--- a/tests/resources/generator/cellml_unit_scaling_state/model.h
+++ b/tests/resources/generator/cellml_unit_scaling_state/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/cellml_unit_scaling_state/model.py b/tests/resources/generator/cellml_unit_scaling_state/model.py
index c4c97bfe12..9f00daa92d 100644
--- a/tests/resources/generator/cellml_unit_scaling_state/model.py
+++ b/tests/resources/generator/cellml_unit_scaling_state/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 2
diff --git a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.c b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.c
index 211ac7e6de..d7d38a97fa 100644
--- a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.c
+++ b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 2;
 const size_t VARIABLE_COUNT = 0;
diff --git a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.h b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.h
index 6d6a6b11a3..7d9f98972d 100644
--- a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.h
+++ b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.py b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.py
index e267808bbc..be278a2de7 100644
--- a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.py
+++ b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_constant/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 2
 VARIABLE_COUNT = 0
diff --git a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.c b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.c
index 3ada142a3b..291fb36f0d 100644
--- a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.c
+++ b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 2;
 const size_t VARIABLE_COUNT = 2;
diff --git a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.h b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.h
index b28167c371..ce185f4bd8 100644
--- a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.h
+++ b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.py b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.py
index 8b4004f24d..40a44cdc77 100644
--- a/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.py
+++ b/tests/resources/generator/cellml_unit_scaling_state_initialised_using_variable/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 2
 VARIABLE_COUNT = 2
diff --git a/tests/resources/generator/cellml_unit_scaling_voi_direct/model.c b/tests/resources/generator/cellml_unit_scaling_voi_direct/model.c
index 1045dc0687..3d6046c4c9 100644
--- a/tests/resources/generator/cellml_unit_scaling_voi_direct/model.c
+++ b/tests/resources/generator/cellml_unit_scaling_voi_direct/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 2;
 const size_t VARIABLE_COUNT = 0;
diff --git a/tests/resources/generator/cellml_unit_scaling_voi_direct/model.h b/tests/resources/generator/cellml_unit_scaling_voi_direct/model.h
index 9303e63ae3..44ae4ed7b5 100644
--- a/tests/resources/generator/cellml_unit_scaling_voi_direct/model.h
+++ b/tests/resources/generator/cellml_unit_scaling_voi_direct/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/cellml_unit_scaling_voi_direct/model.py b/tests/resources/generator/cellml_unit_scaling_voi_direct/model.py
index 3f60206736..e8aadb65f7 100644
--- a/tests/resources/generator/cellml_unit_scaling_voi_direct/model.py
+++ b/tests/resources/generator/cellml_unit_scaling_voi_direct/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 2
 VARIABLE_COUNT = 0
diff --git a/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.c b/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.c
index 6e9c2fad29..ce2438183c 100644
--- a/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.c
+++ b/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 3;
 const size_t VARIABLE_COUNT = 0;
diff --git a/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.h b/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.h
index 6de3690637..738364691a 100644
--- a/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.h
+++ b/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.py b/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.py
index 7005958e20..99fb1821f9 100644
--- a/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.py
+++ b/tests/resources/generator/cellml_unit_scaling_voi_indirect/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 3
 VARIABLE_COUNT = 0
diff --git a/tests/resources/generator/dae_cellml_1_1_model/model.c b/tests/resources/generator/dae_cellml_1_1_model/model.c
index b0da0480cf..061e6de5a9 100644
--- a/tests/resources/generator/dae_cellml_1_1_model/model.c
+++ b/tests/resources/generator/dae_cellml_1_1_model/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 2;
 const size_t VARIABLE_COUNT = 10;
diff --git a/tests/resources/generator/dae_cellml_1_1_model/model.h b/tests/resources/generator/dae_cellml_1_1_model/model.h
index 775b4fec29..639e6a7978 100644
--- a/tests/resources/generator/dae_cellml_1_1_model/model.h
+++ b/tests/resources/generator/dae_cellml_1_1_model/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/dae_cellml_1_1_model/model.py b/tests/resources/generator/dae_cellml_1_1_model/model.py
index 0967f308a9..b7816363eb 100644
--- a/tests/resources/generator/dae_cellml_1_1_model/model.py
+++ b/tests/resources/generator/dae_cellml_1_1_model/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 2
 VARIABLE_COUNT = 10
diff --git a/tests/resources/generator/dependent_eqns/model.c b/tests/resources/generator/dependent_eqns/model.c
index 72e8b4dc61..74b16754d7 100644
--- a/tests/resources/generator/dependent_eqns/model.c
+++ b/tests/resources/generator/dependent_eqns/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 2;
diff --git a/tests/resources/generator/dependent_eqns/model.h b/tests/resources/generator/dependent_eqns/model.h
index 54e3adf9e8..2b8cb0b61b 100644
--- a/tests/resources/generator/dependent_eqns/model.h
+++ b/tests/resources/generator/dependent_eqns/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/dependent_eqns/model.py b/tests/resources/generator/dependent_eqns/model.py
index 7bd1be7460..0bb41cd7a6 100644
--- a/tests/resources/generator/dependent_eqns/model.py
+++ b/tests/resources/generator/dependent_eqns/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 2
diff --git a/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.c b/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.c
index 5b2fdea1d7..ca5618df21 100644
--- a/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.c
+++ b/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 33;
 const size_t VARIABLE_COUNT = 217;
diff --git a/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.h b/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.h
index 1e73f17e6a..63eff32232 100644
--- a/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.h
+++ b/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.py b/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.py
index 2f1c730a91..8fabf1b237 100644
--- a/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.py
+++ b/tests/resources/generator/fabbri_fantini_wilders_severi_human_san_model_2017/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 33
 VARIABLE_COUNT = 217
diff --git a/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.c b/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.c
index d1c26aa57c..17cbafbe57 100644
--- a/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.c
+++ b/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 15;
 const size_t VARIABLE_COUNT = 185;
diff --git a/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.h b/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.h
index 79f9f5c87a..5ddbd13f77 100644
--- a/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.h
+++ b/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.py b/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.py
index f1add8b415..0036692046 100644
--- a/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.py
+++ b/tests/resources/generator/garny_kohl_hunter_boyett_noble_rabbit_san_model_2003/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 15
 VARIABLE_COUNT = 185
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.c
index df19755f3d..d819cf63f4 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.c
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.algebraic.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 4;
 const size_t VARIABLE_COUNT = 18;
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.h
index 525f2c3c3f..4c8aac427f 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.h
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.py
index fde8fbafd3..867f3dbcc4 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.py
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.algebraic.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 4
 VARIABLE_COUNT = 18
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.c
index 240fb2a4d0..7807b1c247 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.c
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 4;
 const size_t VARIABLE_COUNT = 18;
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.c
index 7536350ce3..e531fcfd2b 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.c
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.computed.constant.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 4;
 const size_t VARIABLE_COUNT = 18;
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.h
index 525f2c3c3f..4c8aac427f 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.h
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.py
index df279af939..a1b1edc317 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.py
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.computed.constant.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 4
 VARIABLE_COUNT = 18
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.c
index 5240505e05..bb651d9b0e 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.c
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.constant.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 4;
 const size_t VARIABLE_COUNT = 18;
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.h
index 525f2c3c3f..4c8aac427f 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.h
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.py
index cf9b0c99fe..9766bf9016 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.py
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.constant.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 4
 VARIABLE_COUNT = 18
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.c
index 94b0fde0e2..c6727dd039 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.c
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.dae.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 4;
 const size_t VARIABLE_COUNT = 18;
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.h
index 921c36cfd1..a6e2a81ab8 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.h
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.py
index a78672ba52..de0d02338a 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.py
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dae.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 4
 VARIABLE_COUNT = 18
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.c
index 0140b35169..4cc7291cdd 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.c
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.dependent.algebraic.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 4;
 const size_t VARIABLE_COUNT = 18;
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.h
index 525f2c3c3f..4c8aac427f 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.h
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.py
index 03e5c7c330..9b4dcfdcbc 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.py
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.algebraic.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 4
 VARIABLE_COUNT = 18
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.c
index c74cf081bc..edde51b00c 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.c
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.dependent.computed.constant.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 4;
 const size_t VARIABLE_COUNT = 18;
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.h
index 525f2c3c3f..4c8aac427f 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.h
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.py
index d6873e6275..d3657a87df 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.py
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.computed.constant.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 4
 VARIABLE_COUNT = 18
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.c
index a3ad4ba4ec..a6ad399813 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.c
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.dependent.constant.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 4;
 const size_t VARIABLE_COUNT = 18;
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.h
index 525f2c3c3f..4c8aac427f 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.h
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.py
index a3816969d7..01ef31901b 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.py
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.constant.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 4
 VARIABLE_COUNT = 18
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.c
index 4aa8bde09a..378f99959e 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.c
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.dependent.state.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 2;
 const size_t VARIABLE_COUNT = 20;
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.h
index 525f2c3c3f..4c8aac427f 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.h
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.py
index 507b2f58b5..b9906409f1 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.py
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.dependent.state.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 2
 VARIABLE_COUNT = 20
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.c
index 428d40b752..f8a539e273 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.c
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.external.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 3;
 const size_t VARIABLE_COUNT = 19;
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.h
index 525f2c3c3f..4c8aac427f 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.h
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.py
index 60f658a6c1..098648ee67 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.py
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.external.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 3
 VARIABLE_COUNT = 19
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.h
index 921c36cfd1..a6e2a81ab8 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.h
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.py
index 7343f761af..69f55f4cbe 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.py
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 4
 VARIABLE_COUNT = 18
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.c b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.c
index 6e4ef64afa..c6c110c745 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.c
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.state.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 3;
 const size_t VARIABLE_COUNT = 19;
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.h b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.h
index 525f2c3c3f..4c8aac427f 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.h
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.py b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.py
index ef66381cca..07b8d24cac 100644
--- a/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.py
+++ b/tests/resources/generator/hodgkin_huxley_squid_axon_model_1952/model.state.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 3
 VARIABLE_COUNT = 19
diff --git a/tests/resources/generator/noble_model_1962/model.c b/tests/resources/generator/noble_model_1962/model.c
index 6b792560c5..fc3947d082 100644
--- a/tests/resources/generator/noble_model_1962/model.c
+++ b/tests/resources/generator/noble_model_1962/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 4;
 const size_t VARIABLE_COUNT = 17;
diff --git a/tests/resources/generator/noble_model_1962/model.h b/tests/resources/generator/noble_model_1962/model.h
index 4b13ed1e79..c5f89202b4 100644
--- a/tests/resources/generator/noble_model_1962/model.h
+++ b/tests/resources/generator/noble_model_1962/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/noble_model_1962/model.py b/tests/resources/generator/noble_model_1962/model.py
index ef5da0bc05..c07fcacaa1 100644
--- a/tests/resources/generator/noble_model_1962/model.py
+++ b/tests/resources/generator/noble_model_1962/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 4
 VARIABLE_COUNT = 17
diff --git a/tests/resources/generator/ode_computed_var_on_rhs/model.c b/tests/resources/generator/ode_computed_var_on_rhs/model.c
index 7b1376fb2c..f2723dd1f9 100644
--- a/tests/resources/generator/ode_computed_var_on_rhs/model.c
+++ b/tests/resources/generator/ode_computed_var_on_rhs/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 1;
diff --git a/tests/resources/generator/ode_computed_var_on_rhs/model.h b/tests/resources/generator/ode_computed_var_on_rhs/model.h
index 9303e63ae3..44ae4ed7b5 100644
--- a/tests/resources/generator/ode_computed_var_on_rhs/model.h
+++ b/tests/resources/generator/ode_computed_var_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/ode_computed_var_on_rhs/model.py b/tests/resources/generator/ode_computed_var_on_rhs/model.py
index 1bd57dc917..9d67bfec02 100644
--- a/tests/resources/generator/ode_computed_var_on_rhs/model.py
+++ b/tests/resources/generator/ode_computed_var_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 1
diff --git a/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.c b/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.c
index d2ad4c72d1..5f5119474a 100644
--- a/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.c
+++ b/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 1;
diff --git a/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.h b/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.h
index f1e1489ff9..4b668b8ab4 100644
--- a/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.h
+++ b/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.py b/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.py
index afaa321a42..51975c8970 100644
--- a/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.py
+++ b/tests/resources/generator/ode_computed_var_on_rhs_one_component/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 1
diff --git a/tests/resources/generator/ode_const_var_on_rhs/model.c b/tests/resources/generator/ode_const_var_on_rhs/model.c
index 287c9cdeb8..f65794cefd 100644
--- a/tests/resources/generator/ode_const_var_on_rhs/model.c
+++ b/tests/resources/generator/ode_const_var_on_rhs/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 1;
diff --git a/tests/resources/generator/ode_const_var_on_rhs/model.h b/tests/resources/generator/ode_const_var_on_rhs/model.h
index 9303e63ae3..44ae4ed7b5 100644
--- a/tests/resources/generator/ode_const_var_on_rhs/model.h
+++ b/tests/resources/generator/ode_const_var_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/ode_const_var_on_rhs/model.py b/tests/resources/generator/ode_const_var_on_rhs/model.py
index 23f8104b7d..f8b50e8d0e 100644
--- a/tests/resources/generator/ode_const_var_on_rhs/model.py
+++ b/tests/resources/generator/ode_const_var_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 1
diff --git a/tests/resources/generator/ode_const_var_on_rhs_one_component/model.c b/tests/resources/generator/ode_const_var_on_rhs_one_component/model.c
index a8ed6c8612..62a3755bbb 100644
--- a/tests/resources/generator/ode_const_var_on_rhs_one_component/model.c
+++ b/tests/resources/generator/ode_const_var_on_rhs_one_component/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 1;
diff --git a/tests/resources/generator/ode_const_var_on_rhs_one_component/model.h b/tests/resources/generator/ode_const_var_on_rhs_one_component/model.h
index f1e1489ff9..4b668b8ab4 100644
--- a/tests/resources/generator/ode_const_var_on_rhs_one_component/model.h
+++ b/tests/resources/generator/ode_const_var_on_rhs_one_component/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/ode_const_var_on_rhs_one_component/model.py b/tests/resources/generator/ode_const_var_on_rhs_one_component/model.py
index bf36d8955d..81d6529863 100644
--- a/tests/resources/generator/ode_const_var_on_rhs_one_component/model.py
+++ b/tests/resources/generator/ode_const_var_on_rhs_one_component/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 1
diff --git a/tests/resources/generator/ode_constant_on_rhs/model.c b/tests/resources/generator/ode_constant_on_rhs/model.c
index f48ec3fe3e..fe6da66271 100644
--- a/tests/resources/generator/ode_constant_on_rhs/model.c
+++ b/tests/resources/generator/ode_constant_on_rhs/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 0;
diff --git a/tests/resources/generator/ode_constant_on_rhs/model.h b/tests/resources/generator/ode_constant_on_rhs/model.h
index 9303e63ae3..44ae4ed7b5 100644
--- a/tests/resources/generator/ode_constant_on_rhs/model.h
+++ b/tests/resources/generator/ode_constant_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/ode_constant_on_rhs/model.py b/tests/resources/generator/ode_constant_on_rhs/model.py
index 60f1fa984b..ba4b7a4d05 100644
--- a/tests/resources/generator/ode_constant_on_rhs/model.py
+++ b/tests/resources/generator/ode_constant_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 0
diff --git a/tests/resources/generator/ode_constant_on_rhs_one_component/model.c b/tests/resources/generator/ode_constant_on_rhs_one_component/model.c
index c32855ef56..6d0e99694f 100644
--- a/tests/resources/generator/ode_constant_on_rhs_one_component/model.c
+++ b/tests/resources/generator/ode_constant_on_rhs_one_component/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 0;
diff --git a/tests/resources/generator/ode_constant_on_rhs_one_component/model.h b/tests/resources/generator/ode_constant_on_rhs_one_component/model.h
index f1e1489ff9..4b668b8ab4 100644
--- a/tests/resources/generator/ode_constant_on_rhs_one_component/model.h
+++ b/tests/resources/generator/ode_constant_on_rhs_one_component/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/ode_constant_on_rhs_one_component/model.py b/tests/resources/generator/ode_constant_on_rhs_one_component/model.py
index 73500c1d1b..515951a21c 100644
--- a/tests/resources/generator/ode_constant_on_rhs_one_component/model.py
+++ b/tests/resources/generator/ode_constant_on_rhs_one_component/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 0
diff --git a/tests/resources/generator/ode_multiple_dependent_odes/model.c b/tests/resources/generator/ode_multiple_dependent_odes/model.c
index 12adccd98d..e0c567fe14 100644
--- a/tests/resources/generator/ode_multiple_dependent_odes/model.c
+++ b/tests/resources/generator/ode_multiple_dependent_odes/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 2;
 const size_t VARIABLE_COUNT = 1;
diff --git a/tests/resources/generator/ode_multiple_dependent_odes/model.h b/tests/resources/generator/ode_multiple_dependent_odes/model.h
index 5c96160229..30ab746fe2 100644
--- a/tests/resources/generator/ode_multiple_dependent_odes/model.h
+++ b/tests/resources/generator/ode_multiple_dependent_odes/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/ode_multiple_dependent_odes/model.py b/tests/resources/generator/ode_multiple_dependent_odes/model.py
index 4dd2b1c245..6bf0b2eaec 100644
--- a/tests/resources/generator/ode_multiple_dependent_odes/model.py
+++ b/tests/resources/generator/ode_multiple_dependent_odes/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 2
 VARIABLE_COUNT = 1
diff --git a/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.c b/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.c
index 2cd822deb2..becf215e02 100644
--- a/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.c
+++ b/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 2;
 const size_t VARIABLE_COUNT = 1;
diff --git a/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.h b/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.h
index 8bf456229c..a1f08dbe91 100644
--- a/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.h
+++ b/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.py b/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.py
index db7ce3132f..53b487c96d 100644
--- a/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.py
+++ b/tests/resources/generator/ode_multiple_dependent_odes_one_component/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 2
 VARIABLE_COUNT = 1
diff --git a/tests/resources/generator/ode_multiple_odes_with_same_name/model.c b/tests/resources/generator/ode_multiple_odes_with_same_name/model.c
index 89b2f0269f..2f110c59d7 100644
--- a/tests/resources/generator/ode_multiple_odes_with_same_name/model.c
+++ b/tests/resources/generator/ode_multiple_odes_with_same_name/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 2;
 const size_t VARIABLE_COUNT = 1;
diff --git a/tests/resources/generator/ode_multiple_odes_with_same_name/model.h b/tests/resources/generator/ode_multiple_odes_with_same_name/model.h
index 5d4ca0716d..e1c9c3dae3 100644
--- a/tests/resources/generator/ode_multiple_odes_with_same_name/model.h
+++ b/tests/resources/generator/ode_multiple_odes_with_same_name/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/ode_multiple_odes_with_same_name/model.py b/tests/resources/generator/ode_multiple_odes_with_same_name/model.py
index 6deb5b65f3..d88e1c041b 100644
--- a/tests/resources/generator/ode_multiple_odes_with_same_name/model.py
+++ b/tests/resources/generator/ode_multiple_odes_with_same_name/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 2
 VARIABLE_COUNT = 1
diff --git a/tests/resources/generator/ode_unknown_var_on_rhs/model.c b/tests/resources/generator/ode_unknown_var_on_rhs/model.c
index e58fa77bf0..8b00427bfe 100644
--- a/tests/resources/generator/ode_unknown_var_on_rhs/model.c
+++ b/tests/resources/generator/ode_unknown_var_on_rhs/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 2;
 const size_t VARIABLE_COUNT = 0;
diff --git a/tests/resources/generator/ode_unknown_var_on_rhs/model.h b/tests/resources/generator/ode_unknown_var_on_rhs/model.h
index 9303e63ae3..44ae4ed7b5 100644
--- a/tests/resources/generator/ode_unknown_var_on_rhs/model.h
+++ b/tests/resources/generator/ode_unknown_var_on_rhs/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/ode_unknown_var_on_rhs/model.py b/tests/resources/generator/ode_unknown_var_on_rhs/model.py
index d9bd7aa2be..0d213f44ce 100644
--- a/tests/resources/generator/ode_unknown_var_on_rhs/model.py
+++ b/tests/resources/generator/ode_unknown_var_on_rhs/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 2
 VARIABLE_COUNT = 0
diff --git a/tests/resources/generator/robertson_model_1966/model.dae.c b/tests/resources/generator/robertson_model_1966/model.dae.c
index e2915de939..eef8866345 100644
--- a/tests/resources/generator/robertson_model_1966/model.dae.c
+++ b/tests/resources/generator/robertson_model_1966/model.dae.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.dae.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 2;
 const size_t VARIABLE_COUNT = 5;
diff --git a/tests/resources/generator/robertson_model_1966/model.dae.h b/tests/resources/generator/robertson_model_1966/model.dae.h
index ccc12feaa7..b9bae88ffe 100644
--- a/tests/resources/generator/robertson_model_1966/model.dae.h
+++ b/tests/resources/generator/robertson_model_1966/model.dae.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/robertson_model_1966/model.dae.py b/tests/resources/generator/robertson_model_1966/model.dae.py
index 8da11629b1..0eeba6ff40 100644
--- a/tests/resources/generator/robertson_model_1966/model.dae.py
+++ b/tests/resources/generator/robertson_model_1966/model.dae.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 2
 VARIABLE_COUNT = 5
diff --git a/tests/resources/generator/robertson_model_1966/model.ode.c b/tests/resources/generator/robertson_model_1966/model.ode.c
index d7f5a3811f..b3115ac8d6 100644
--- a/tests/resources/generator/robertson_model_1966/model.ode.c
+++ b/tests/resources/generator/robertson_model_1966/model.ode.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.ode.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 3;
 const size_t VARIABLE_COUNT = 4;
diff --git a/tests/resources/generator/robertson_model_1966/model.ode.h b/tests/resources/generator/robertson_model_1966/model.ode.h
index ccc12feaa7..b9bae88ffe 100644
--- a/tests/resources/generator/robertson_model_1966/model.ode.h
+++ b/tests/resources/generator/robertson_model_1966/model.ode.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/robertson_model_1966/model.ode.py b/tests/resources/generator/robertson_model_1966/model.ode.py
index 55198cc41a..48c5143dd7 100644
--- a/tests/resources/generator/robertson_model_1966/model.ode.py
+++ b/tests/resources/generator/robertson_model_1966/model.ode.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 3
 VARIABLE_COUNT = 4
diff --git a/tests/resources/generator/sine_model_imports/model.c b/tests/resources/generator/sine_model_imports/model.c
index f270736d59..83cfee26f5 100644
--- a/tests/resources/generator/sine_model_imports/model.c
+++ b/tests/resources/generator/sine_model_imports/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 10;
diff --git a/tests/resources/generator/sine_model_imports/model.h b/tests/resources/generator/sine_model_imports/model.h
index 24b2fe3f0f..3c02e8275a 100644
--- a/tests/resources/generator/sine_model_imports/model.h
+++ b/tests/resources/generator/sine_model_imports/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/sine_model_imports/model.py b/tests/resources/generator/sine_model_imports/model.py
index e14572eb25..160304537f 100644
--- a/tests/resources/generator/sine_model_imports/model.py
+++ b/tests/resources/generator/sine_model_imports/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 10
diff --git a/tests/resources/generator/unknown_variable_as_external_variable/model.c b/tests/resources/generator/unknown_variable_as_external_variable/model.c
index b324146ae9..70a8e9c7e9 100644
--- a/tests/resources/generator/unknown_variable_as_external_variable/model.c
+++ b/tests/resources/generator/unknown_variable_as_external_variable/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t VARIABLE_COUNT = 10;
 
diff --git a/tests/resources/generator/unknown_variable_as_external_variable/model.h b/tests/resources/generator/unknown_variable_as_external_variable/model.h
index bea9fc99b3..79d874b464 100644
--- a/tests/resources/generator/unknown_variable_as_external_variable/model.h
+++ b/tests/resources/generator/unknown_variable_as_external_variable/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/unknown_variable_as_external_variable/model.py b/tests/resources/generator/unknown_variable_as_external_variable/model.py
index adeded13d5..59c9632115 100644
--- a/tests/resources/generator/unknown_variable_as_external_variable/model.py
+++ b/tests/resources/generator/unknown_variable_as_external_variable/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 VARIABLE_COUNT = 10
 
diff --git a/tests/resources/generator/variable_initialised_using_a_constant/model.c b/tests/resources/generator/variable_initialised_using_a_constant/model.c
index 048c4adee2..607852737f 100644
--- a/tests/resources/generator/variable_initialised_using_a_constant/model.c
+++ b/tests/resources/generator/variable_initialised_using_a_constant/model.c
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #include "model.h"
 
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 const char VERSION[] = "0.5.0";
-const char LIBCELLML_VERSION[] = "0.6.0";
+const char LIBCELLML_VERSION[] = "0.6.1";
 
 const size_t STATE_COUNT = 1;
 const size_t VARIABLE_COUNT = 1;
diff --git a/tests/resources/generator/variable_initialised_using_a_constant/model.h b/tests/resources/generator/variable_initialised_using_a_constant/model.h
index c5fa4a2f9a..61cb786e05 100644
--- a/tests/resources/generator/variable_initialised_using_a_constant/model.h
+++ b/tests/resources/generator/variable_initialised_using_a_constant/model.h
@@ -1,4 +1,4 @@
-/* The content of this file was generated using the C profile of libCellML 0.6.0. */
+/* The content of this file was generated using the C profile of libCellML 0.6.1. */
 
 #pragma once
 
diff --git a/tests/resources/generator/variable_initialised_using_a_constant/model.py b/tests/resources/generator/variable_initialised_using_a_constant/model.py
index ea64fa616a..5a45cc2696 100644
--- a/tests/resources/generator/variable_initialised_using_a_constant/model.py
+++ b/tests/resources/generator/variable_initialised_using_a_constant/model.py
@@ -1,11 +1,11 @@
-# The content of this file was generated using the Python profile of libCellML 0.6.0.
+# The content of this file was generated using the Python profile of libCellML 0.6.1.
 
 from enum import Enum
 from math import *
 
 
 __version__ = "0.4.0"
-LIBCELLML_VERSION = "0.6.0"
+LIBCELLML_VERSION = "0.6.1"
 
 STATE_COUNT = 1
 VARIABLE_COUNT = 1
diff --git a/tests/version/version.cpp b/tests/version/version.cpp
index 4c556e57a6..8740e36c7c 100644
--- a/tests/version/version.cpp
+++ b/tests/version/version.cpp
@@ -5,8 +5,8 @@
 TEST(Version, versionMatch)
 {
     unsigned int version = libcellml::version();
-    EXPECT_EQ(0x000600U, version);
+    EXPECT_EQ(0x000601U, version);
 
     std::string versionString = libcellml::versionString();
-    EXPECT_EQ("0.6.0", versionString);
+    EXPECT_EQ("0.6.1", versionString);
 }