diff --git a/jerry-core/CMakeLists.txt b/jerry-core/CMakeLists.txt
index 44cdba97d..fbbeb161c 100644
--- a/jerry-core/CMakeLists.txt
+++ b/jerry-core/CMakeLists.txt
@@ -328,94 +328,94 @@ if(ENABLE_AMALGAM)
     ecma/base/ecma-literal-storage.h
     ecma/base/ecma-module.h
     ecma/base/ecma-property-hashmap.h
-    ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h
-    ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-array.inc.h
     ecma/builtin-objects/ecma-builtin-array-iterator-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-array-prototype.inc.h
     ecma/builtin-objects/ecma-builtin-array-prototype-unscopables.inc.h
-    ecma/builtin-objects/ecma-builtin-async-function.inc.h
+    ecma/builtin-objects/ecma-builtin-array-prototype.inc.h
+    ecma/builtin-objects/ecma-builtin-array.inc.h
+    ecma/builtin-objects/ecma-builtin-arraybuffer-prototype.inc.h
+    ecma/builtin-objects/ecma-builtin-arraybuffer.inc.h
     ecma/builtin-objects/ecma-builtin-async-function-prototype.inc.h
+    ecma/builtin-objects/ecma-builtin-async-function.inc.h
     ecma/builtin-objects/ecma-builtin-async-generator-function.inc.h
-    ecma/builtin-objects/ecma-builtin-async-generator.inc.h
     ecma/builtin-objects/ecma-builtin-async-generator-prototype.inc.h
+    ecma/builtin-objects/ecma-builtin-async-generator.inc.h
     ecma/builtin-objects/ecma-builtin-async-iterator-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-bigint.inc.h
     ecma/builtin-objects/ecma-builtin-bigint-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-boolean.inc.h
+    ecma/builtin-objects/ecma-builtin-bigint.inc.h
     ecma/builtin-objects/ecma-builtin-boolean-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-dataview.inc.h
+    ecma/builtin-objects/ecma-builtin-boolean.inc.h
     ecma/builtin-objects/ecma-builtin-dataview-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-date.inc.h
+    ecma/builtin-objects/ecma-builtin-dataview.inc.h
     ecma/builtin-objects/ecma-builtin-date-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-error.inc.h
+    ecma/builtin-objects/ecma-builtin-date.inc.h
     ecma/builtin-objects/ecma-builtin-error-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-evalerror.inc.h
+    ecma/builtin-objects/ecma-builtin-error.inc.h
     ecma/builtin-objects/ecma-builtin-evalerror-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-function.inc.h
+    ecma/builtin-objects/ecma-builtin-evalerror.inc.h
     ecma/builtin-objects/ecma-builtin-function-prototype.h
     ecma/builtin-objects/ecma-builtin-function-prototype.inc.h
+    ecma/builtin-objects/ecma-builtin-function.inc.h
     ecma/builtin-objects/ecma-builtin-generator-function.inc.h
-    ecma/builtin-objects/ecma-builtin-generator.inc.h
     ecma/builtin-objects/ecma-builtin-generator-prototype.inc.h
+    ecma/builtin-objects/ecma-builtin-generator.inc.h
     ecma/builtin-objects/ecma-builtin-global.inc.h
     ecma/builtin-objects/ecma-builtin-handlers.h
     ecma/builtin-objects/ecma-builtin-handlers.inc.h
-    ecma/builtin-objects/ecma-builtin-helpers.h
     ecma/builtin-objects/ecma-builtin-helpers-macro-defines.inc.h
     ecma/builtin-objects/ecma-builtin-helpers-macro-undefs.inc.h
+    ecma/builtin-objects/ecma-builtin-helpers.h
     ecma/builtin-objects/ecma-builtin-internal-routines-template.inc.h
     ecma/builtin-objects/ecma-builtin-intrinsic.inc.h
     ecma/builtin-objects/ecma-builtin-iterator-prototype.inc.h
     ecma/builtin-objects/ecma-builtin-json.inc.h
-    ecma/builtin-objects/ecma-builtin-map.inc.h
     ecma/builtin-objects/ecma-builtin-map-iterator-prototype.inc.h
     ecma/builtin-objects/ecma-builtin-map-prototype.inc.h
+    ecma/builtin-objects/ecma-builtin-map.inc.h
     ecma/builtin-objects/ecma-builtin-math.inc.h
-    ecma/builtin-objects/ecma-builtin-number.inc.h
     ecma/builtin-objects/ecma-builtin-number-prototype.inc.h
+    ecma/builtin-objects/ecma-builtin-number.inc.h
+    ecma/builtin-objects/ecma-builtin-object-prototype.inc.h
     ecma/builtin-objects/ecma-builtin-object.h
     ecma/builtin-objects/ecma-builtin-object.inc.h
-    ecma/builtin-objects/ecma-builtin-object-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-promise.inc.h
     ecma/builtin-objects/ecma-builtin-promise-prototype.inc.h
+    ecma/builtin-objects/ecma-builtin-promise.inc.h
     ecma/builtin-objects/ecma-builtin-proxy.inc.h
-    ecma/builtin-objects/ecma-builtin-rangeerror.inc.h
     ecma/builtin-objects/ecma-builtin-rangeerror-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-referenceerror.inc.h
+    ecma/builtin-objects/ecma-builtin-rangeerror.inc.h
     ecma/builtin-objects/ecma-builtin-referenceerror-prototype.inc.h
+    ecma/builtin-objects/ecma-builtin-referenceerror.inc.h
     ecma/builtin-objects/ecma-builtin-reflect.inc.h
-    ecma/builtin-objects/ecma-builtin-regexp.inc.h
     ecma/builtin-objects/ecma-builtin-regexp-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-set.inc.h
+    ecma/builtin-objects/ecma-builtin-regexp.inc.h
     ecma/builtin-objects/ecma-builtin-set-iterator-prototype.inc.h
     ecma/builtin-objects/ecma-builtin-set-prototype.inc.h
-    ecma/builtin-objects/ecma-builtins.h
-    ecma/builtin-objects/ecma-builtins.inc.h
-    ecma/builtin-objects/ecma-builtins-internal.h
-    ecma/builtin-objects/ecma-builtin-string.inc.h
+    ecma/builtin-objects/ecma-builtin-set.inc.h
     ecma/builtin-objects/ecma-builtin-string-iterator-prototype.inc.h
     ecma/builtin-objects/ecma-builtin-string-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-symbol.inc.h
+    ecma/builtin-objects/ecma-builtin-string.inc.h
     ecma/builtin-objects/ecma-builtin-symbol-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h
+    ecma/builtin-objects/ecma-builtin-symbol.inc.h
     ecma/builtin-objects/ecma-builtin-syntaxerror-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-typeerror.inc.h
-    ecma/builtin-objects/ecma-builtin-typeerror-prototype.inc.h
+    ecma/builtin-objects/ecma-builtin-syntaxerror.inc.h
     ecma/builtin-objects/ecma-builtin-type-error-thrower.inc.h
-    ecma/builtin-objects/ecma-builtin-urierror.inc.h
+    ecma/builtin-objects/ecma-builtin-typeerror-prototype.inc.h
+    ecma/builtin-objects/ecma-builtin-typeerror.inc.h
     ecma/builtin-objects/ecma-builtin-urierror-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-weakmap.inc.h
+    ecma/builtin-objects/ecma-builtin-urierror.inc.h
     ecma/builtin-objects/ecma-builtin-weakmap-prototype.inc.h
-    ecma/builtin-objects/ecma-builtin-weakset.inc.h
+    ecma/builtin-objects/ecma-builtin-weakmap.inc.h
     ecma/builtin-objects/ecma-builtin-weakset-prototype.inc.h
+    ecma/builtin-objects/ecma-builtin-weakset.inc.h
+    ecma/builtin-objects/ecma-builtins-internal.h
+    ecma/builtin-objects/ecma-builtins.h
+    ecma/builtin-objects/ecma-builtins.inc.h
     ecma/operations/ecma-arguments-object.h
-    ecma/operations/ecma-arraybuffer-object.h
     ecma/operations/ecma-array-object.h
+    ecma/operations/ecma-arraybuffer-object.h
     ecma/operations/ecma-async-generator-object.h
-    ecma/operations/ecma-bigint.h
-    ecma/operations/ecma-bigint-object.h
     ecma/operations/ecma-big-uint.h
+    ecma/operations/ecma-bigint-object.h
+    ecma/operations/ecma-bigint.h
     ecma/operations/ecma-boolean-object.h
     ecma/operations/ecma-comparison.h
     ecma/operations/ecma-container-object.h
@@ -440,32 +440,32 @@ if(ENABLE_AMALGAM)
     ecma/operations/ecma-typedarray-object.h
     include/jerryscript-compiler.h
     include/jerryscript-core.h
-    include/jerryscript-debugger.h
     include/jerryscript-debugger-transport.h
-    include/jerryscript.h
+    include/jerryscript-debugger.h
     include/jerryscript-port.h
     include/jerryscript-snapshot.h
+    include/jerryscript.h
     jcontext/jcontext.h
     jmem/jmem-allocator-internal.h
     jmem/jmem.h
     jrt/jrt-bit-fields.h
-    jrt/jrt.h
     jrt/jrt-libc-includes.h
     jrt/jrt-types.h
+    jrt/jrt.h
     lit/lit-char-helpers.h
     lit/lit-globals.h
     lit/lit-magic-strings.h
     lit/lit-magic-strings.inc.h
     lit/lit-strings.h
-    lit/lit-unicode-conversions.inc.h
     lit/lit-unicode-conversions-sup.inc.h
+    lit/lit-unicode-conversions.inc.h
     lit/lit-unicode-folding.inc.h
-    lit/lit-unicode-ranges.inc.h
     lit/lit-unicode-ranges-sup.inc.h
+    lit/lit-unicode-ranges.inc.h
     vm/opcodes.h
     vm/vm-defines.h
-    vm/vm.h
     vm/vm-stack.h
+    vm/vm.h
   )
 
   # Generated files
diff --git a/tests/unit-core/CMakeLists.txt b/tests/unit-core/CMakeLists.txt
index c5517fd46..6981df452 100644
--- a/tests/unit-core/CMakeLists.txt
+++ b/tests/unit-core/CMakeLists.txt
@@ -25,63 +25,63 @@ endif()
 
 # Unit tests main modules
 set(SOURCE_UNIT_TEST_MAIN_MODULES
-  test-has-property.c
-  test-api-objecttype.c
-  test-strings.c
-  test-exec-stop.c
-  test-api-functiontype.c
-  test-external-string.c
-  test-from-property-descriptor.c
-  test-dataview.c
-  test-api-errortype.c
-  test-arraybuffer.c
-  test-api-object-property-names.c
-  test-to-integer.c
-  test-regression-3588.c
-  test-number-converter.c
-  test-api-value-type.c
-  test-jmem.c
-  test-promise.c
-  test-realm.c
-  test-internal-properties.c
   test-abort.c
-  test-api-promise.c
-  test-context-data.c
-  test-backtrace.c
-  test-objects-foreach.c
   test-api-binary-operations-arithmetics.c
   test-api-binary-operations-comparisons.c
-  test-to-length.c
-  test-api-strings.c
-  test-proxy.c
-  test-container.c
   test-api-binary-operations-instanceof.c
-  test-snapshot.c
-  test-native-callback-nested.c
-  test-lit-char-helpers.c
-  test-resource-name.c
-  test-unicode.c
-  test-bigint.c
-  test-api-property.c
+  test-api-errortype.c
+  test-api-functiontype.c
   test-api-iteratortype.c
-  test-api.c
-  test-typedarray.c
+  test-api-object-property-names.c
+  test-api-objecttype.c
+  test-api-promise.c
+  test-api-property.c
   test-api-set-and-clear-error-flag.c
+  test-api-strings.c
+  test-api-value-type.c
+  test-api.c
+  test-arraybuffer.c
+  test-backtrace.c
+  test-bigint.c
+  test-container.c
+  test-context-data.c
+  test-dataview.c
+  test-date-helpers.c
+  test-exec-stop.c
+  test-external-string.c
+  test-from-property-descriptor.c
+  test-has-property.c
+  test-internal-properties.c
+  test-jmem.c
   test-json.c
-  test-native-instanceof.c
+  test-lit-char-helpers.c
   test-literal-storage.c
   test-mem-stats.c
+  test-native-callback-nested.c
+  test-native-instanceof.c
   test-newtarget.c
+  test-number-converter.c
   test-number-to-int32.c
   test-number-to-string.c
-  test-string-to-number.c
+  test-objects-foreach.c
   test-poolman.c
+  test-promise.c
+  test-proxy.c
+  test-realm.c
   test-regexp-dotall-unicode.c
-  test-date-helpers.c
   test-regexp.c
+  test-regression-3588.c
+  test-resource-name.c
+  test-snapshot.c
+  test-string-to-number.c
   test-stringbuilder.c
+  test-strings.c
   test-symbol.c
+  test-to-integer.c
+  test-to-length.c
   test-to-property-descriptor.c
+  test-typedarray.c
+  test-unicode.c
 )
 
 # jerry_heap_stats_t.size == 0 if system allocator is used.
diff --git a/tests/unit-ext/CMakeLists.txt b/tests/unit-ext/CMakeLists.txt
index e0e82b643..d048bf736 100644
--- a/tests/unit-ext/CMakeLists.txt
+++ b/tests/unit-ext/CMakeLists.txt
@@ -20,17 +20,17 @@ set(INCLUDE_UNIT_EXT ${CMAKE_CURRENT_SOURCE_DIR})
 # Unit tests main modules
 set(SOURCE_UNIT_TEST_EXT_MODULES
   test-ext-arg.c
-  test-ext-handle-scope-handle-prelist.c
-  test-ext-module-empty.c
   test-ext-autorelease.c
-  test-ext-handle-scope-nested.c
-  test-ext-handle-scope.c
   test-ext-handle-scope-escape.c
-  test-ext-method-register.c
   test-ext-handle-scope-handle-prelist-escape.c
+  test-ext-handle-scope-handle-prelist.c
+  test-ext-handle-scope-nested.c
   test-ext-handle-scope-remove.c
   test-ext-handle-scope-root.c
+  test-ext-handle-scope.c
+  test-ext-method-register.c
   test-ext-module-canonical.c
+  test-ext-module-empty.c
 )
 
 # Disable test-ext-autorelease.c if compiler is MSVC, because MSVC doesn't support cleanup attribute.