From 50a456b87f828701f20200a0b6ecfac794bcd239 Mon Sep 17 00:00:00 2001
From: Alexander Bock <mail@alexanderbock.eu>
Date: Fri, 9 Oct 2020 17:32:30 +0200
Subject: [PATCH] Issue/1299 (#1312)

Change profile file format from a custom one to JSON
---
 apps/OpenSpace/ext/sgct                       |    2 +-
 .../constellations/constellation_data.csv     |   85 --
 data/profiles/default.profile                 |   52 +-
 ext/ghoul                                     |    2 +-
 include/openspace/scene/profile.h             |   39 +-
 src/CMakeLists.txt                            |    2 +
 src/engine/openspaceengine.cpp                |   10 +-
 src/scene/profile.cpp                         | 1222 +++++++----------
 src/util/time.cpp                             |    3 +-
 .../profile/basic/additional_scripts.profile  |    8 +
 tests/profile/basic/assets.profile            |    8 +
 tests/profile/basic/camera_gotogeo.profile    |    9 +
 .../basic/camera_gotogeo_altitude.profile     |   10 +
 .../basic/camera_navstate_full.profile        |   13 +
 .../basic/camera_navstate_no_aim.profile      |   12 +
 .../basic/camera_navstate_no_pitch.profile    |   12 +
 .../basic/camera_navstate_no_up.profile       |   12 +
 .../basic/camera_navstate_no_yaw.profile      |   12 +
 tests/profile/basic/deltatimes.profile        |   10 +
 tests/profile/basic/keybindings.profile       |   29 +
 tests/profile/basic/mark_nodes.profile        |    6 +
 tests/profile/basic/meta_empty.profile        |   11 +
 tests/profile/basic/meta_full.profile         |   11 +
 tests/profile/basic/meta_no_author.profile    |   10 +
 .../profile/basic/meta_no_description.profile |   10 +
 tests/profile/basic/meta_no_license.profile   |   10 +
 tests/profile/basic/meta_no_name.profile      |   10 +
 tests/profile/basic/meta_no_url.profile       |   10 +
 tests/profile/basic/meta_no_version.profile   |   10 +
 tests/profile/basic/modules.profile           |   19 +
 tests/profile/basic/properties.profile        |   35 +
 tests/profile/basic/time_absolute.profile     |    7 +
 tests/profile/basic/time_relative.profile     |    7 +
 .../profile/basic_additional_scripts.profile  |    7 -
 tests/profile/basic_assets.profile            |    7 -
 tests/profile/basic_camera_gotogeo.profile    |    5 -
 .../basic_camera_gotogeo_altitude.profile     |    5 -
 tests/profile/basic_camera_navstate.profile   |    5 -
 tests/profile/basic_deltatimes.profile        |    9 -
 tests/profile/basic_keybindings.profile       |    7 -
 tests/profile/basic_mark_nodes.profile        |    7 -
 tests/profile/basic_meta.profile              |   10 -
 tests/profile/basic_modules.profile           |    7 -
 tests/profile/basic_properties.profile        |   10 -
 tests/profile/basic_time_absolute.profile     |    5 -
 tests/profile/basic_time_relative.profile     |    5 -
 .../basic_version_one_component.profile       |    2 -
 .../basic_version_two_components.profile      |    2 -
 .../camera/camera_gotogeo_altitude.profile    |   10 +
 .../camera/gotogeo_missing_anchor.profile     |    9 +
 .../camera/gotogeo_missing_latitude.profile   |    9 +
 .../camera/gotogeo_missing_longitude.profile  |    9 +
 .../camera/gotogeo_wrongtype_altitude.profile |   10 +
 .../camera/gotogeo_wrongtype_anchor.profile   |   10 +
 .../camera/gotogeo_wrongtype_latitude.profile |   10 +
 .../gotogeo_wrongtype_longitude.profile       |   10 +
 .../camera/navstate_missing_anchor.profile    |   12 +
 .../camera/navstate_missing_frame.profile     |   12 +
 .../camera/navstate_missing_position.profile  |   12 +
 .../navstate_missing_position_x.profile       |   13 +
 .../navstate_missing_position_y.profile       |   13 +
 .../navstate_missing_position_z.profile       |   13 +
 .../camera/navstate_missing_up_x.profile      |   13 +
 .../camera/navstate_missing_up_y.profile      |   13 +
 .../camera/navstate_missing_up_z.profile      |   13 +
 .../camera/navstate_wrongtype_aim.profile     |   13 +
 .../camera/navstate_wrongtype_anchor.profile  |   13 +
 .../camera/navstate_wrongtype_frame.profile   |   13 +
 .../camera/navstate_wrongtype_pitch.profile   |   13 +
 .../navstate_wrongtype_position.profile       |   13 +
 .../navstate_wrongtype_position_x.profile     |   13 +
 .../navstate_wrongtype_position_y.profile     |   13 +
 .../navstate_wrongtype_position_z.profile     |   13 +
 .../camera/navstate_wrongtype_up.profile      |   13 +
 .../camera/navstate_wrongtype_up_x.profile    |   13 +
 .../camera/navstate_wrongtype_up_y.profile    |   13 +
 .../camera/navstate_wrongtype_up_z.profile    |   13 +
 .../camera/navstate_wrongtype_yaw.profile     |   13 +
 .../error/camera/wrongvalue_type.profile      |    6 +
 .../error/deltatimes/wrongtype_value.profile  |    6 +
 .../keybinding/missing_documentation.profile  |   12 +
 .../error/keybinding/missing_guipath.profile  |   12 +
 .../error/keybinding/missing_islocal.profile  |   12 +
 .../error/keybinding/missing_key.profile      |   12 +
 .../error/keybinding/missing_name.profile     |   12 +
 .../keybinding/missing_script - Copy.profile  |   13 +
 .../error/keybinding/missing_script.profile   |   12 +
 .../wrongtype_documentation.profile           |   13 +
 .../keybinding/wrongtype_guipath.profile      |   13 +
 .../keybinding/wrongtype_islocal.profile      |   13 +
 .../error/keybinding/wrongtype_name.profile   |   13 +
 .../error/keybinding/wrongtype_script.profile |   13 +
 .../error/keybinding/wrongvalue_key.profile   |   13 +
 .../keybinding/wrongvalue_modifier.profile    |   29 +
 .../meta/wrong_parameter_value_type.profile   |    6 +
 .../profile/error/module/missing_name.profile |    8 +
 .../wrongtype_loadedInstruction.profile       |   10 +
 .../error/module/wrongtype_name.profile       |   10 +
 .../wrongtype_notLoadedInstruction.profile    |   10 +
 .../error/property/missing_name.profile       |    9 +
 .../error/property/missing_name_value.profile |    8 +
 .../error/property/missing_value.profile      |    9 +
 .../error/property/wrongtype_name.profile     |   10 +
 .../error/property/wrongtype_value.profile    |   10 +
 .../error/property/wrongvalue_type.profile    |   10 +
 .../error/time/absolute_missing_value.profile |    6 +
 tests/profile/error/time/missing_type.profile |    5 +
 .../error/time/relative_missing_value.profile |    6 +
 .../error/time/too_few_parameters.profile     |    6 +
 .../error/time/wrongvalue_type.profile        |    7 +
 .../error/version/missing_major.profile       |    3 +
 .../error/version/missing_minor.profile       |    3 +
 .../error/version/wrongtype_major.profile     |    3 +
 .../version/wrongtype_major_minor.profile     |    3 +
 .../error/version/wrongtype_minor.profile     |    3 +
 .../error_asset_too_few_parameters.profile    |    5 -
 .../error_asset_too_many_parameters.profile   |    5 -
 ..._camera_gotogeo_too_few_parameters.profile |    5 -
 ...camera_gotogeo_too_many_parameters.profile |    5 -
 ...camera_navstate_too_few_parameters.profile |    5 -
 ...amera_navstate_too_many_parameters.profile |    5 -
 ...ameter_too_few_components_position.profile |    5 -
 ...ng_parameter_too_few_components_up.profile |    5 -
 ...meter_too_many_components_position.profile |    5 -
 ...avstate_wrong_parameter_type_pitch.profile |    5 -
 ..._navstate_wrong_parameter_type_yaw.profile |    5 -
 ...eter_wrong_component_type_position.profile |    5 -
 ..._parameter_wrong_component_type_up.profile |    5 -
 ..._camera_wrong_parameter_value_type.profile |    5 -
 ...tatimes_wrong_parameter_value_type.profile |    8 -
 ...rror_keybinding_too_few_parameters.profile |    5 -
 ...ror_keybinding_too_many_parameters.profile |    5 -
 ...binding_wrong_parameter_type_local.profile |    5 -
 ...ybinding_wrong_parameter_value_key.profile |    7 -
 ...ing_wrong_parameter_value_modifier.profile |    7 -
 ...or_meta_wrong_parameter_value_type.profile |    5 -
 .../error_missing_separator_line.profile      |    4 -
 .../error_module_too_few_parameters.profile   |    5 -
 .../error_module_too_many_parameters.profile  |    5 -
 .../error_property_too_few_parameters.profile |    5 -
 ...error_property_too_many_parameters.profile |    5 -
 ...roperty_wrong_parameter_value_type.profile |    5 -
 .../error_time_too_few_parameters.profile     |    5 -
 .../error_time_too_many_parameters.profile    |    5 -
 ...or_time_wrong_parameter_value_type.profile |    5 -
 .../profile/error_two_camera_sections.profile |    8 -
 tests/profile/error_two_meta_sections.profile |   18 -
 tests/profile/error_two_time_sections.profile |    8 -
 .../error_two_version_sections.profile        |    5 -
 .../profile/error_unrecognized_header.profile |    7 -
 .../error_version_malformed_component.profile |    2 -
 tests/profile/error_version_not_first.profile |    7 -
 .../error_version_too_many_components.profile |    2 -
 tests/profile/integration/full_test.profile   |  116 ++
 tests/profile/integration_full_test.profile   |   53 -
 ...ntegration_full_test_permutation_1.profile |   54 -
 ...gration_full_test_permutation_base.profile |   53 -
 tests/profile/minimal.profile                 |    5 +-
 tests/test_profile.cpp                        | 1125 +++++++++------
 tests/test_spicemanager.cpp                   |    1 -
 tests/test_timequantizer.cpp                  |    2 +-
 161 files changed, 2366 insertions(+), 1766 deletions(-)
 delete mode 100644 data/assets/scene/milkyway/constellations/constellation_data.csv
 create mode 100644 tests/profile/basic/additional_scripts.profile
 create mode 100644 tests/profile/basic/assets.profile
 create mode 100644 tests/profile/basic/camera_gotogeo.profile
 create mode 100644 tests/profile/basic/camera_gotogeo_altitude.profile
 create mode 100644 tests/profile/basic/camera_navstate_full.profile
 create mode 100644 tests/profile/basic/camera_navstate_no_aim.profile
 create mode 100644 tests/profile/basic/camera_navstate_no_pitch.profile
 create mode 100644 tests/profile/basic/camera_navstate_no_up.profile
 create mode 100644 tests/profile/basic/camera_navstate_no_yaw.profile
 create mode 100644 tests/profile/basic/deltatimes.profile
 create mode 100644 tests/profile/basic/keybindings.profile
 create mode 100644 tests/profile/basic/mark_nodes.profile
 create mode 100644 tests/profile/basic/meta_empty.profile
 create mode 100644 tests/profile/basic/meta_full.profile
 create mode 100644 tests/profile/basic/meta_no_author.profile
 create mode 100644 tests/profile/basic/meta_no_description.profile
 create mode 100644 tests/profile/basic/meta_no_license.profile
 create mode 100644 tests/profile/basic/meta_no_name.profile
 create mode 100644 tests/profile/basic/meta_no_url.profile
 create mode 100644 tests/profile/basic/meta_no_version.profile
 create mode 100644 tests/profile/basic/modules.profile
 create mode 100644 tests/profile/basic/properties.profile
 create mode 100644 tests/profile/basic/time_absolute.profile
 create mode 100644 tests/profile/basic/time_relative.profile
 delete mode 100644 tests/profile/basic_additional_scripts.profile
 delete mode 100644 tests/profile/basic_assets.profile
 delete mode 100644 tests/profile/basic_camera_gotogeo.profile
 delete mode 100644 tests/profile/basic_camera_gotogeo_altitude.profile
 delete mode 100644 tests/profile/basic_camera_navstate.profile
 delete mode 100644 tests/profile/basic_deltatimes.profile
 delete mode 100644 tests/profile/basic_keybindings.profile
 delete mode 100644 tests/profile/basic_mark_nodes.profile
 delete mode 100644 tests/profile/basic_meta.profile
 delete mode 100644 tests/profile/basic_modules.profile
 delete mode 100644 tests/profile/basic_properties.profile
 delete mode 100644 tests/profile/basic_time_absolute.profile
 delete mode 100644 tests/profile/basic_time_relative.profile
 delete mode 100644 tests/profile/basic_version_one_component.profile
 delete mode 100644 tests/profile/basic_version_two_components.profile
 create mode 100644 tests/profile/error/camera/camera_gotogeo_altitude.profile
 create mode 100644 tests/profile/error/camera/gotogeo_missing_anchor.profile
 create mode 100644 tests/profile/error/camera/gotogeo_missing_latitude.profile
 create mode 100644 tests/profile/error/camera/gotogeo_missing_longitude.profile
 create mode 100644 tests/profile/error/camera/gotogeo_wrongtype_altitude.profile
 create mode 100644 tests/profile/error/camera/gotogeo_wrongtype_anchor.profile
 create mode 100644 tests/profile/error/camera/gotogeo_wrongtype_latitude.profile
 create mode 100644 tests/profile/error/camera/gotogeo_wrongtype_longitude.profile
 create mode 100644 tests/profile/error/camera/navstate_missing_anchor.profile
 create mode 100644 tests/profile/error/camera/navstate_missing_frame.profile
 create mode 100644 tests/profile/error/camera/navstate_missing_position.profile
 create mode 100644 tests/profile/error/camera/navstate_missing_position_x.profile
 create mode 100644 tests/profile/error/camera/navstate_missing_position_y.profile
 create mode 100644 tests/profile/error/camera/navstate_missing_position_z.profile
 create mode 100644 tests/profile/error/camera/navstate_missing_up_x.profile
 create mode 100644 tests/profile/error/camera/navstate_missing_up_y.profile
 create mode 100644 tests/profile/error/camera/navstate_missing_up_z.profile
 create mode 100644 tests/profile/error/camera/navstate_wrongtype_aim.profile
 create mode 100644 tests/profile/error/camera/navstate_wrongtype_anchor.profile
 create mode 100644 tests/profile/error/camera/navstate_wrongtype_frame.profile
 create mode 100644 tests/profile/error/camera/navstate_wrongtype_pitch.profile
 create mode 100644 tests/profile/error/camera/navstate_wrongtype_position.profile
 create mode 100644 tests/profile/error/camera/navstate_wrongtype_position_x.profile
 create mode 100644 tests/profile/error/camera/navstate_wrongtype_position_y.profile
 create mode 100644 tests/profile/error/camera/navstate_wrongtype_position_z.profile
 create mode 100644 tests/profile/error/camera/navstate_wrongtype_up.profile
 create mode 100644 tests/profile/error/camera/navstate_wrongtype_up_x.profile
 create mode 100644 tests/profile/error/camera/navstate_wrongtype_up_y.profile
 create mode 100644 tests/profile/error/camera/navstate_wrongtype_up_z.profile
 create mode 100644 tests/profile/error/camera/navstate_wrongtype_yaw.profile
 create mode 100644 tests/profile/error/camera/wrongvalue_type.profile
 create mode 100644 tests/profile/error/deltatimes/wrongtype_value.profile
 create mode 100644 tests/profile/error/keybinding/missing_documentation.profile
 create mode 100644 tests/profile/error/keybinding/missing_guipath.profile
 create mode 100644 tests/profile/error/keybinding/missing_islocal.profile
 create mode 100644 tests/profile/error/keybinding/missing_key.profile
 create mode 100644 tests/profile/error/keybinding/missing_name.profile
 create mode 100644 tests/profile/error/keybinding/missing_script - Copy.profile
 create mode 100644 tests/profile/error/keybinding/missing_script.profile
 create mode 100644 tests/profile/error/keybinding/wrongtype_documentation.profile
 create mode 100644 tests/profile/error/keybinding/wrongtype_guipath.profile
 create mode 100644 tests/profile/error/keybinding/wrongtype_islocal.profile
 create mode 100644 tests/profile/error/keybinding/wrongtype_name.profile
 create mode 100644 tests/profile/error/keybinding/wrongtype_script.profile
 create mode 100644 tests/profile/error/keybinding/wrongvalue_key.profile
 create mode 100644 tests/profile/error/keybinding/wrongvalue_modifier.profile
 create mode 100644 tests/profile/error/meta/wrong_parameter_value_type.profile
 create mode 100644 tests/profile/error/module/missing_name.profile
 create mode 100644 tests/profile/error/module/wrongtype_loadedInstruction.profile
 create mode 100644 tests/profile/error/module/wrongtype_name.profile
 create mode 100644 tests/profile/error/module/wrongtype_notLoadedInstruction.profile
 create mode 100644 tests/profile/error/property/missing_name.profile
 create mode 100644 tests/profile/error/property/missing_name_value.profile
 create mode 100644 tests/profile/error/property/missing_value.profile
 create mode 100644 tests/profile/error/property/wrongtype_name.profile
 create mode 100644 tests/profile/error/property/wrongtype_value.profile
 create mode 100644 tests/profile/error/property/wrongvalue_type.profile
 create mode 100644 tests/profile/error/time/absolute_missing_value.profile
 create mode 100644 tests/profile/error/time/missing_type.profile
 create mode 100644 tests/profile/error/time/relative_missing_value.profile
 create mode 100644 tests/profile/error/time/too_few_parameters.profile
 create mode 100644 tests/profile/error/time/wrongvalue_type.profile
 create mode 100644 tests/profile/error/version/missing_major.profile
 create mode 100644 tests/profile/error/version/missing_minor.profile
 create mode 100644 tests/profile/error/version/wrongtype_major.profile
 create mode 100644 tests/profile/error/version/wrongtype_major_minor.profile
 create mode 100644 tests/profile/error/version/wrongtype_minor.profile
 delete mode 100644 tests/profile/error_asset_too_few_parameters.profile
 delete mode 100644 tests/profile/error_asset_too_many_parameters.profile
 delete mode 100644 tests/profile/error_camera_gotogeo_too_few_parameters.profile
 delete mode 100644 tests/profile/error_camera_gotogeo_too_many_parameters.profile
 delete mode 100644 tests/profile/error_camera_navstate_too_few_parameters.profile
 delete mode 100644 tests/profile/error_camera_navstate_too_many_parameters.profile
 delete mode 100644 tests/profile/error_camera_navstate_wrong_parameter_too_few_components_position.profile
 delete mode 100644 tests/profile/error_camera_navstate_wrong_parameter_too_few_components_up.profile
 delete mode 100644 tests/profile/error_camera_navstate_wrong_parameter_too_many_components_position.profile
 delete mode 100644 tests/profile/error_camera_navstate_wrong_parameter_type_pitch.profile
 delete mode 100644 tests/profile/error_camera_navstate_wrong_parameter_type_yaw.profile
 delete mode 100644 tests/profile/error_camera_navstate_wrong_parameter_wrong_component_type_position.profile
 delete mode 100644 tests/profile/error_camera_navstate_wrong_parameter_wrong_component_type_up.profile
 delete mode 100644 tests/profile/error_camera_wrong_parameter_value_type.profile
 delete mode 100644 tests/profile/error_deltatimes_wrong_parameter_value_type.profile
 delete mode 100644 tests/profile/error_keybinding_too_few_parameters.profile
 delete mode 100644 tests/profile/error_keybinding_too_many_parameters.profile
 delete mode 100644 tests/profile/error_keybinding_wrong_parameter_type_local.profile
 delete mode 100644 tests/profile/error_keybinding_wrong_parameter_value_key.profile
 delete mode 100644 tests/profile/error_keybinding_wrong_parameter_value_modifier.profile
 delete mode 100644 tests/profile/error_meta_wrong_parameter_value_type.profile
 delete mode 100644 tests/profile/error_missing_separator_line.profile
 delete mode 100644 tests/profile/error_module_too_few_parameters.profile
 delete mode 100644 tests/profile/error_module_too_many_parameters.profile
 delete mode 100644 tests/profile/error_property_too_few_parameters.profile
 delete mode 100644 tests/profile/error_property_too_many_parameters.profile
 delete mode 100644 tests/profile/error_property_wrong_parameter_value_type.profile
 delete mode 100644 tests/profile/error_time_too_few_parameters.profile
 delete mode 100644 tests/profile/error_time_too_many_parameters.profile
 delete mode 100644 tests/profile/error_time_wrong_parameter_value_type.profile
 delete mode 100644 tests/profile/error_two_camera_sections.profile
 delete mode 100644 tests/profile/error_two_meta_sections.profile
 delete mode 100644 tests/profile/error_two_time_sections.profile
 delete mode 100644 tests/profile/error_two_version_sections.profile
 delete mode 100644 tests/profile/error_unrecognized_header.profile
 delete mode 100644 tests/profile/error_version_malformed_component.profile
 delete mode 100644 tests/profile/error_version_not_first.profile
 delete mode 100644 tests/profile/error_version_too_many_components.profile
 create mode 100644 tests/profile/integration/full_test.profile
 delete mode 100644 tests/profile/integration_full_test.profile
 delete mode 100644 tests/profile/integration_full_test_permutation_1.profile
 delete mode 100644 tests/profile/integration_full_test_permutation_base.profile

diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct
index 3d3835c38c..f54b2fc6f0 160000
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
@@ -1 +1 @@
-Subproject commit 3d3835c38c8b87972f406ed44af1b5b2d48b1600
+Subproject commit f54b2fc6f01f42bb0158734a3cfc565c3d5cf281
diff --git a/data/assets/scene/milkyway/constellations/constellation_data.csv b/data/assets/scene/milkyway/constellations/constellation_data.csv
deleted file mode 100644
index 7c02f310de..0000000000
--- a/data/assets/scene/milkyway/constellations/constellation_data.csv
+++ /dev/null
@@ -1,85 +0,0 @@
-Data about Constellations columns are: group, name, x, y, z, scale, imageName, rotX, rotY, rotZ, centerStar
-normal,Ori,Orion,-550.8742,-259.3621,-188.9620,1.5,Ori.png,1.128407,1.058407,1.668407,HD37128
-zodiac,Tau,Taurus,-18.7277,-0.3175,-6.9092,1.2,Tau.png,1.198407,0.908407,1.378407,Aldebran
-zodiac,Ari,Aries,-13.2892,9.4519,-11.9378,0.8,Ari.png,0.668407,0.538407,0.518407,Hamal
-zodiac,Gem,Gemini,-362.5493,-102.2245,79.4030,0.85,Gem.png,-0.731593,2.268407,-0.451593,Mekbuda
-zodiac,Cnc,Cancer,-30.9209,-16.4584,22.6601,0.8,Cnc.png,-1.151593,1.888407,-1.041593,HD74442
-zodiac,Leo,Leo,-17.9030,-13.2719,31.4196,1.33,Leo.png,-0.131593,2.448407,0.418407,HD89484
-zodiac,Vir,Virgo,36.5809,-35.1877,62.3341,1.5,Vir.png,-0.371593,3.138407,0.518407,HD116658
-zodiac,Lib,Libra,17.5393,-6.2768,14.5916,1.0,Lib.png,-1.011593,3.138407,1.318407,HD130819
-zodiac,Sco,Scorpius,137.4378,-19.4456,37.3606,1.2,Sco.png,1.698407,-1.001593,-1.751593,HD148478
-zodiac,Sgr,Sagittarius,66.2304,11.1498,-14.8095,1.2,Sgr.png,1.728407,-1.321593,-1.751593,HD175191
-zodiac,Cap,Capricornus,32.9799,20.0621,-29.3945,1.3,Cap.png,1.158407,-0.881593,-0.561593,HD200761
-zodiac,Aqr,Aquarius,86.5090,149.4078,-155.8102,1.2,Aqr.png,-2.921593,-2.391593,-2.551593,-2.511593
-zodiac,Psc,Pisces,-28.0235,45.3150,-76.8893,1.6,Psc.png,0.458407,-0.001593,0.618407,HD4656
-northern,Uma,Ursa Major,-12.0503,7.1931,19.8974,1.6,UMa.png,0.748407,2.398407,0.658407,HD95418
-northern,Dra,Draco,-1.4340,20.6566,23.5098,1.9,Dra.png,0.658407,-2.541593,1.058407,HD137759
-southern,Ant,Antila,-0.2233,-103.8908,42.7940,1.3,Ant.png,1.848407,0.198407,-3.141593,HD90610
-southern,Crv,Corvus,8.0442,-16.8858,19.3984,1.1,Crv.png,2.198407,-0.041593,-2.221593,HD108767
-southern,Cet,Cetus,-28.7960,7.2425,-73.6693,1.5,Cet.png,0.238407,0.368407,0.688407,HD11353
-southern,Cha,Chameleon,53.5121,-108.3624,-38.1807,1.1,Cha.png,-1.801593,2.738407,0.448407,HD92305
-northern,Cam,Camelopardalis,-304.8155,179.0620,71.1454,1.7,Cam.png,2.128407,1.228407,1.478407,HD31910
-equatorial,Aql,Aquila,11.7741,9.7467,-1.6418,1.0,Aql.png,-2.601593,-2.511593,-3.141593,HD182640
-southern,Aps,Apus,31.6370,-32.5620,-16.5786,1.1,Aps.png,-1.691593,-2.281593,0.838407,HD149324
-northern,Lyn,Lynx,-98.3174,4.4830,67.2289,1.2,Lyn.png,1.688407,1.768407,1.668407,HD70272
-southern,Phe,Phoenix,5.0172,-4.2096,-22.8088,1.5,Phe.png,-3.141593,3.138407,-3.141593,HD6595
-northern,Cyg,Cygnus,78.7445,375.2440,12.4995,1.4,Cyg.png,1.668407,-0.931593,-0.261593,HD194093
-southern,Cen,Centaurus,20.1398,-33.1830,9.5915,2.7,Cen.png,-1.291593,3.088407,0.458407,HD110304
-northern,Aur,Auriga,-12.3062,3.8595,1.0302,1.5,Aur.png,1.378407,1.108407,1.178407,HD34029
-northern,Peg,Pegasus,0.9791,32.5947,-27.7339,2.42,Peg.png,0.918407,-0.221593,-0.191593,HD218045
-southern,Hya,Hydra,-2.9043,-33.5496,25.8962,3,Hya.png,-0.531593,2.838407,0.368407,HD93813
-southern,Oct,Octans,22.0434,-27.8601,-24.3108,1.0,Oct.png,-0.911593,0.398407,1.198407,HD214846
-southern,Nor,Norma,34.9251,-17.5643,0.0068,1.0,Nor.png,-1.631593,-2.421593,1.298407,HD146686
-southern,Mus,Musca,48.8888,-79.2952,-10.2828,1.25,Mus.png,-1.871593,3.138407,0.358407,HD109668
-southern,Hyi,Hydrus,3.2767,-4.7183,-4.7829,1.1,Hyi.png,2.438407,-3.141593,-2.381593,HD2151
-northern,Lac,Lacerta,-6.0878,30.5794,-3.6064,1.0,Lac.png,-1.521593,-2.391593,3.138407,HD213558
-equatorial,Lep,Lepus,-212.6297,-184.4909,-132.1156,1.0,Lep.png,-1.801593,-2.351593,-0.861593,HD36673
-southern,Lup,Lupus,129.1166,-102.2983,33.3251,1.2,Lup.png,-1.191593,-2.391593,0.798407,HD129056
-southern,Men,Mensa,2.4149,-8.5586,-4.8892,1.0,Men.png,-2.101593,-2.781593,0.828407,HD43834
-southern,Mic,Microscopium,51.0335,11.1671,-44.3692,1.0,Mic.png,0.728407,-0.831593,-0.561593,HD199951
-equatorial,Mon,Monoceros,-93.0725,-66.8909,8.6548,1.2,Mon.png,-1.331593,1.988407,-0.891593,HD55185
-southern,Pav,Pavo,4.4549,-2.5959,-3.2739,1.3,Pav.png,-2.391593,-2.171593,1.648407,HD190248
-southern,Ind,Indus,133.6149,-53.5569,-115.9552,1.5,Ind.png,-2.031593,-1.491593,1.758407,HD198700
-northern,LMi,Leo Minor,-23.3948,-2.5770,38.0756,1.1,LMi.png,-3.141593,0.478407,-2.201593,HD90537
-northern,Lyr,Lyra,2.8086,6.7630,2.5555,1.0,Lyr.png,-1.831593,-2.091593,3.141500,HD172167
-northern,Her,Hercules,14.0526,14.9773,12.5478,1.3,Her.png,-1.511593,-1.811593,2.288407,HD156164
-southern,Gru,Grus,18.6528,-3.2893,-24.6602,1.3,Gru.png,-3.141593,-2.511593,-2.901593,HD209952
-southern,Crt,Crater,1.5886,-43.9831,40.3390,1.3,Crt.png,-0.521593,3.140000,0.588407,HD98430
-northern,Del,Delphinus,14.8599,24.6150,-8.0550,1.2,Del.png,1.308407,-0.951593,-0.241593,HD196524
-southern,Dor,Dorado,-0.6460,-9.3172,-6.9654,1.2,Dor.png,2.118407,1.768407,-2.901593,HD33262
-northern,Equ,Equuleus,27.7363,41.7071,-27.4371,1.2,Equ.png,-1.801593,-2.511593,2.558407,HD202447
-southern,Eri,Eridanus,-37.5153,-23.5231,-65.6368,2.1,Eri.png,0.128407,0.698407,0.998407,HD20720
-southern,For,Fornax,-14.0351,-17.8282,-46.5514,1.4,For.png,3.138407,2.678407,-2.351593,HD17652
-southern,Hor,Horologium,2.1021,-27.1310,-40.5136,1.2,Hor.png,-3.141593,2.468407,-2.191593,HD16920
-southern,Pyx,Pyxis,-66.7424,-248.9639,26.0445,1.2,Pyx.png,1.838407,-1.651593,2.708407,HD74575
-southern,Ret,Reticulum,2.8130,-37.2904,-33.2644,1.5,Ret.png,1.998407,2.188407,-2.591593,HD27256
-northern,Sge,Sagitta,44.3886,70.9446,-7.6264,1.2,Sge.png,-0.741593,-2.231593,2.108407,HD189319
-southern,Scl,Sculptor,21.6545,-6.8861,-166.5240,1.3,Scl.png,-0.071593,-0.221593,0.638407,HD2429
-southern,Sct,Scutum,48.8939,21.5158,-0.1629,1.2,Sct.png,1.188407,-1.271593,-0.971593,HD171443
-southern,Tuc,Tucana,35.3950,-20.2535,-45.2324,1.1,Tuc.png,-0.351593,-0.161593,0.308407,HD211416
-northern,Tri,Triangulum,-26.6263,21.9119,-16.2254,1.2,Tri.png,1.168407,0.218407,0.558407,HD13161
-southern,TrA,Triangulum Australe,96.2283,-76.4459,-33.5257,1.2,TrA.png,-1.991593,-2.491593,1.128407,HD150798
-southern,Tel,Telescopium,72.3444,-14.5016,-20.0248,1.2,Tel.png,-0.461593,-1.731593,0.298407,HD169467
-southern,Ara,Ara,164.9273,-75.6246,-35.3100,1.1,Ara.png,-1.381593,-2.131593,1.048407,HD157244
-southern,Cae,Caelum,-6.0961,-13.7926,-13.3392,1.0,Cae.png,-0.661593,0.948407,0.418407,HD29875
-southern,CMa,Canis Major,-1.7693,-1.9125,-0.4074,1.3,CMa.png,1.128407,1.048407,1.878407,HD48915
-northern,CMi,Canis Minor,-2.8348,-1.8906,0.7881,1.2,CMi.png,2.538407,1.138407,-3.141593,HD61421
-southern,Vol,Volans,37.6000,-182.7856,-62.6559,1.2,Vol.png,-2.441593,1.988407,-0.351593,HD68520
-northern,UMi,Ursa Minor,-11.3527,27.2100,25.1835,1.3,UMi.png,-2.491593,-0.581593,-2.381593,HD131873
-northern,And,Andromdeda,-32.8276,43.3946,-27.8475,1.6,And.png,-2.021593,-3.141593,-2.521593,HD6860
-northern,Boo,Bootes,11.2468,14.9864,30.4945,2.0,Boo.png,-3.141593,-0.601593,-2.361593,HD135722
-northern,Vul,Vulpecula,46.7540,77.7780,5.3953,1.1,Vul.png,-2.301593,-2.061593,-3.141593,HD131873
-northern,CVn,Canes Venatici,-3.1198,5.7935,33.1368,1.3,CVn.png,0.148407,3.138407,0.428407,HD112413
-southern,Cir,Circinus,11.4255,-11.6937,-1.3129,1.0,Cir.png,1.448407,-0.391593,-2.211593,HD128898
-northern,Com,Coma Berenices,1.9257,-1.2062,12.2465,1.4,Com.png,3.138407,-0.051593,-2.711593,HD114378
-southern,CrA,Corona Australis,146.1322,-4.7492,-53.7124,1.0,CrA.png,-3.141593,-2.021593,-3.141593,HD178345
-northern,CrB,Corona Borealis,33.5737,32.0314,52.9729,1.3,CrB.png,-3.141593,-0.601593,-2.271593,HD143107
-northern,Cas,Cassiopeia,-36.3073,59.4424,-7.6926,1.4,Cas.png,-1.431593,3.128407,-2.331593,HD3712
-northern,Cep,Cepheus,-2.8178,14.4985,2.3848,1.7,Cep.png,-1.331593,-2.291593,-2.931593,HD203280
-southern,Car,Carina Vela Puppis,14.1325,-188.6018,-42.2785,2.0,Car.png,2.078407,1.048407,-3.111593,HD71129
-northern,Col,Columba,-11.2568,-20.5973,-11.9895,1.0,Col.png,2.518407,1.358407,-2.981593,HD39425
-northern,Per,Perseus,-139.8202,79.8063,-16.2631,1.3,Per.png,-1.751593,2.428407,-2.411593,HD22928
-northern,Oph,Ophiuchus,127.9419,14.0822,56.2015,3.2,Oph.png,2.178407,-0.781593,-1.681593,HD149757
-southern,PsA,Piscis Austrinus,99.9977,47.6679,-199.6345,1.0,PsA.png,3.138407,-2.541593,-2.881593,HD214748
-southern,Cru,Crux,49.3509,-85.0446,-0.6223,1.1,Cru.png,1.718407,0.048407,-2.741593,HD108248
-southern,Pic,Pictor,-4.5417,-45.5649,-27.1768,1.0,Pic.png,2.568407,2.138407,-2.081593,HD39523
diff --git a/data/profiles/default.profile b/data/profiles/default.profile
index cedf4ad6d7..d9cd9a8631 100644
--- a/data/profiles/default.profile
+++ b/data/profiles/default.profile
@@ -1,22 +1,30 @@
-#Version
-1.0
-
-#Asset
-base	
-scene/solarsystem/planets/earth/earth	earthAsset
-scene/solarsystem/planets/earth/satellites/satellites	
-
-#Property
-setPropertyValue	{earth_satellites}.Renderable.Enabled	false
-
-#Time
-relative	-1d
-
-#Camera
-goToGeo	earthAsset.Earth.Identifier	58.5877	16.1924	20000000
-
-#MarkNodes
-Earth
-Mars
-Moon
-Sun
+{
+  "version": {
+    "major": 1,
+    "minor": 0
+  },
+  "assets": [
+    "base",
+    "scene/solarsystem/planets/earth/earth",
+    "scene/solarsystem/planets/earth/satellites/satellites"
+  ],
+  "properties": [
+    {
+      "type": "setPropertyValue",
+      "name": "{earth_satellites}.Renderable.Enabled",
+      "value": "false"
+    }
+  ],
+  "time": {
+    "type": "relative",
+    "value": "-1d"
+  },
+  "camera": {
+    "type": "goToGeo",
+    "anchor": "Earth",
+    "latitude": 58.5877,
+    "longitude": 16.1924,
+    "altitude": 20000000
+  },
+  "mark_nodes": [ "Earth", "Mars", "Moon", "Sun" ]
+}
diff --git a/ext/ghoul b/ext/ghoul
index f568acc5fe..6e9bb084a1 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit f568acc5fee29a5b0c654f183baddcb7a061e7a6
+Subproject commit 6e9bb084a147d85faf7f28980251752d6dae5f98
diff --git a/include/openspace/scene/profile.h b/include/openspace/scene/profile.h
index c70df31be3..eccf6a0dd7 100644
--- a/include/openspace/scene/profile.h
+++ b/include/openspace/scene/profile.h
@@ -29,6 +29,7 @@
 #include <openspace/interaction/navigationhandler.h>
 #include <openspace/properties/propertyowner.h>
 #include <openspace/util/keys.h>
+#include <ghoul/misc/exception.h>
 #include <optional>
 #include <string>
 #include <variant>
@@ -40,6 +41,14 @@ namespace scripting { struct LuaLibrary; }
 
 class Profile {
 public:
+    struct ParsingError : public ghoul::RuntimeError {
+        enum class Severity { Info, Warning, Error };
+
+        explicit ParsingError(Severity severity, std::string msg);
+
+        Severity severity;
+    };
+
     // Version
     struct Version {
         int major = 0;
@@ -47,20 +56,16 @@ public:
     };
     struct Module {
         std::string name;
-        std::string loadedInstruction;
-        std::string notLoadedInstruction;
+        std::optional<std::string> loadedInstruction;
+        std::optional<std::string> notLoadedInstruction;
     };
     struct Meta {
-        std::string name;
-        std::string version;
-        std::string description;
-        std::string author;
-        std::string url;
-        std::string license;
-    };
-    struct Asset {
-        std::string path;
-        std::string name;
+        std::optional<std::string> name;
+        std::optional<std::string> version;
+        std::optional<std::string> description;
+        std::optional<std::string> author;
+        std::optional<std::string> url;
+        std::optional<std::string> license;
     };
     struct Property {
         enum class SetType {
@@ -87,13 +92,13 @@ public:
         };
 
         Type type;
-        std::string time;
+        std::string value;
     };
     struct CameraNavState {
         static constexpr const char* Type = "setNavigationState";
 
         std::string anchor;
-        std::string aim;
+        std::optional<std::string> aim;
         std::string referenceFrame;
         glm::dvec3 position;
         std::optional<glm::dvec3> up;
@@ -109,9 +114,9 @@ public:
         std::optional<double> altitude;
     };
     using CameraType = std::variant<CameraNavState, CameraGoToGeo>;
-
+  
     Profile() = default;
-    Profile(const std::vector<std::string>& content);
+    explicit Profile(const std::string& content);
     std::string serialize() const;
 
     std::string convertToScene() const;
@@ -147,7 +152,7 @@ private:
     Version version = CurrentVersion;
     std::vector<Module> modules;
     std::optional<Meta> meta;
-    std::vector<Asset> assets;
+    std::vector<std::string> assets;
     std::vector<Property> properties;
     std::vector<Keybinding> keybindings;
     std::optional<Time> time;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 70f0d93979..79b38ffae6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -435,6 +435,8 @@ target_include_directories(openspace-core PUBLIC
   ${OPENSPACE_BASE_DIR}
   # In order to use the date library
   ${OPENSPACE_BASE_DIR}/ext/date/include
+  # In order to use the nlohmann JSON library
+  ${OPENSPACE_BASE_DIR}/ext
   # In order to be able to include the module_registration file
   ${CMAKE_BINARY_DIR}/_generated/include
 )
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index ca310525c2..e698a27376 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -318,12 +318,10 @@ void OpenSpaceEngine::initialize() {
                 );
             }
 
-            std::vector<std::string> content;
-            std::string line;
-            while (std::getline(inFile, line)) {
-                content.push_back(std::move(line));
-            }
-
+            std::string content(
+                (std::istreambuf_iterator<char>(inFile)),
+                std::istreambuf_iterator<char>()
+            );
             global::profile = Profile(content);
 
             // Then save the profile to a scene so that we can load it with the
diff --git a/src/scene/profile.cpp b/src/scene/profile.cpp
index 796965d5f8..f895e58cf9 100644
--- a/src/scene/profile.cpp
+++ b/src/scene/profile.cpp
@@ -27,9 +27,13 @@
 #include <openspace/scripting/lualibrary.h>
 #include <openspace/properties/property.h>
 #include <openspace/properties/propertyowner.h>
+#include <ghoul/misc/assert.h>
 #include <ghoul/fmt.h>
+#include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/misc.h>
 #include <ghoul/misc/profiling.h>
+#include <json/json.hpp>
+#include <set>
 
 #include "profile_lua.inl"
 
@@ -37,36 +41,11 @@ namespace openspace {
 
 namespace {
     constexpr const char* _loggerCat = "Profile";
-    
-    constexpr const char* headerVersion = "#Version";
-    constexpr const char* headerMeta = "#Meta";
-    constexpr const char* headerModule = "#Module";
-    constexpr const char* headerAsset = "#Asset";
-    constexpr const char* headerProperty = "#Property";
-    constexpr const char* headerKeybinding = "#Keybinding";
-    constexpr const char* headerTime = "#Time";
-    constexpr const char* headerDeltaTimes = "#DeltaTimes";
-    constexpr const char* headerCamera = "#Camera";
-    constexpr const char* headerMarkNodes = "#MarkNodes";
-    constexpr const char* headerAdditionalScripts = "#AdditionalScripts";
 
     // Helper structs for the visitor pattern of the std::variant
     template <class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
     template <class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
 
-    struct ProfileParsingError : public ghoul::RuntimeError {
-        explicit ProfileParsingError(std::string msg)
-            : ghoul::RuntimeError(std::move(msg), "profileFile")
-        {}
-
-        ProfileParsingError(unsigned int lineNum, std::string msg)
-            : ghoul::RuntimeError(
-                fmt::format("Error @ line {}: {}", lineNum, std::move(msg)),
-                "profileFile"
-            )
-        {}
-    };
-
     std::vector<properties::Property*> changedProperties(
                                                       const properties::PropertyOwner& po)
     {
@@ -83,391 +62,387 @@ namespace {
         return res;
     }
 
-    enum class Section {
-        None,
-        Version,
-        Meta,
-        Module,
-        Asset,
-        Property,
-        Keybinding,
-        Time,
-        DeltaTimes,
-        Camera,
-        MarkNodes,
-        AdditionalScripts
-    };
-
-    Section parseSection(const std::string& line, int lineNumber) {
-        if (line == headerVersion) { return Section::Version; }
-        if (line == headerMeta) { return Section::Meta; }
-        if (line == headerModule) { return Section::Module; }
-        if (line == headerAsset) { return Section::Asset; }
-        if (line == headerProperty) { return Section::Property; }
-        if (line == headerKeybinding) { return Section::Keybinding; }
-        if (line == headerTime) { return Section::Time; }
-        if (line == headerDeltaTimes) { return Section::DeltaTimes; }
-        if (line == headerCamera) { return Section::Camera; }
-        if (line == headerMarkNodes) { return Section::MarkNodes; }
-        if (line == headerAdditionalScripts) { return Section::AdditionalScripts; }
-
-        throw ProfileParsingError(
-            lineNumber,
-            fmt::format("Invalid section header: {}", line)
-        );
-    }
-
-    [[ nodiscard ]] Profile::Version parseVersion(const std::string& line, int lineNumber)
+    void checkValue(const nlohmann::json& j, const std::string& key,
+        bool (nlohmann::json::*checkFunc)() const, std::string_view keyPrefix,
+        bool isOptional)
     {
-        std::vector<std::string> parts = ghoul::tokenizeString(line, '.');
-        if (parts.size() > 2) {
-            throw ProfileParsingError(
-                lineNumber,
-                fmt::format("Expected 1-2 version components, got {}", parts.size())
-            );
-        }
-
-        try {
-            Profile::Version version;
-            if (parts.empty()) {
-                version.major = std::stoi(line);
+        if (j.find(key) == j.end()) {
+            if (!isOptional) {
+                throw Profile::ParsingError(
+                    Profile::ParsingError::Severity::Error,
+                    fmt::format("'{}.{}' field is missing", keyPrefix, key)
+                );
             }
-            else {
-                version.major = std::stoi(parts[0]);
-            }
-            if (parts.size() > 1) {
-                version.minor = std::stoi(parts[1]);
-            }
-            return version;
-        }
-        catch (const std::invalid_argument&) {
-            throw ProfileParsingError(
-                lineNumber,
-                "Error parsing Version. Version number is not a number"
-            );
-        }
-    }
-
-    [[ nodiscard ]] Profile::Module parseModule(const std::string& line, int lineNumber) {
-        std::vector<std::string> fields = ghoul::tokenizeString(line, '\t');
-        if (fields.size() != 3) {
-            throw ProfileParsingError(
-                lineNumber,
-                fmt::format("Expected 3 fields in a Module entry, got {}", fields.size())
-            );
-        }
-        Profile::Module m;
-        m.name = fields[0];
-        m.loadedInstruction = fields[1];
-        m.notLoadedInstruction = fields[2];
-        return m;
-    }
-
-    enum class MetaLineType {
-        Name,
-        Version,
-        Description,
-        Author,
-        URL,
-        License
-    };
-
-    [[ nodiscard ]] std::pair<MetaLineType, std::string> parseMeta(
-                                                                   const std::string& line,
-                                                                           int lineNumber)
-    {
-        std::vector<std::string> fields = ghoul::tokenizeString(line, '\t');
-        if (fields.size() < 2) {
-            throw ProfileParsingError(
-                lineNumber,
-                fmt::format("Expected 2 fields in a Meta line, got {}", fields.size())
-            );
-        }
-
-        const std::string type = fields[0];
-
-        // Users are allowed to use \t in their lines, meaning that the fields could
-        // contain more than the 2 elements that we expected
-        fields.erase(fields.begin());
-        const std::string content = ghoul::join(fields, "\t");
-
-        if (type == "Name") {
-            return { MetaLineType::Name, content };
-        }
-        else if (type == "Version") {
-            return { MetaLineType::Version, content };
-        }
-        else if (type == "Description") {
-            return { MetaLineType::Description, content };
-        }
-        else if (type == "Author") {
-            return { MetaLineType::Author, content };
-        }
-        else if (type == "URL") {
-            return { MetaLineType::URL, content };
-        }
-        else if (type == "License") {
-            return { MetaLineType::License, content };
         }
         else {
-            throw ProfileParsingError(
-                lineNumber,
-                fmt::format("Unknown meta line type '{}'", type)
-            );
-        }
-    }
-
-    [[ nodiscard ]] Profile::Asset parseAsset(const std::string& line, int lineNumber) {
-        std::vector<std::string> fields = ghoul::tokenizeString(line, '\t');
-        if (fields.size() != 2) {
-            throw ProfileParsingError(
-                lineNumber,
-                fmt::format("Expected 2 fields in an Asset entry, got {}", fields.size())
-            );
-        }
-
-        Profile::Asset a;
-        a.path = fields[0];
-        a.name = fields[1];
-        return a;
-    }
-
-    [[ nodiscard ]] Profile::Property parseProperty(const std::string& line, int lineNumber) {
-        std::vector<std::string> fields = ghoul::tokenizeString(line, '\t');
-        if (fields.size() != 3) {
-            throw ProfileParsingError(
-                lineNumber,
-                fmt::format("Expected 3 fields in Property entry, got {}", fields.size())
-            );
-        }
-        Profile::Property p;
-        p.setType = [&](const std::string& type) -> Profile::Property::SetType {
-            if (type == "setPropertyValue") {
-                return Profile::Property::SetType::SetPropertyValue;
-            }
-            if (type == "setPropertyValueSingle") {
-                return Profile::Property::SetType::SetPropertyValueSingle;
-            }
-            throw ProfileParsingError(
-                lineNumber,
-                fmt::format(
-                    "Expected property set type 'setPropertyValue' or "
-                    "'setPropertyValueSingle', got '{}'",
-                    type
-                )
-            );
-        }(fields[0]);
-        p.name = fields[1];
-        p.value = fields[2];
-        return p;
-    }
-
-    [[ nodiscard ]] Profile::Keybinding parseKeybinding(const std::string& line, int lineNumber) {
-        std::vector<std::string> fields = ghoul::tokenizeString(line, '\t');
-        if (fields.size() != 6) {
-            throw ProfileParsingError(
-                lineNumber,
-                fmt::format("Expected 6 fields in Keybinding entry, got {}", fields.size())
-            );
-        }
-        Profile::Keybinding kb;
-        try {
-            kb.key = stringToKey(fields[0]);
-        }
-        catch (const ghoul::RuntimeError& e) {
-            throw ProfileParsingError(lineNumber, e.what());
-        }
-        kb.documentation = fields[1];
-        kb.name = fields[2];
-        kb.guiPath = fields[3];
-        kb.isLocal = [&](const std::string& local) -> bool {
-            if (local == "false") {
-                return false;
-            }
-            if (local == "true") {
-                return true;
-            }
-            throw ProfileParsingError(
-                lineNumber,
-                fmt::format("Expected 'false' or 'true' for the local path, got {}", local)
-            );
-        }(fields[4]);
-        kb.script = fields[5];
-        return kb;
-    }
-
-    [[ nodiscard ]] Profile::Time parseTime(const std::string& line, int lineNumber) {
-        std::vector<std::string> fields = ghoul::tokenizeString(line, '\t');
-        if (fields.size() != 2) {
-            throw ProfileParsingError(
-                lineNumber,
-                fmt::format("Expected 2 fields in Time entry, got {}", fields.size())
-            );
-        }
-        Profile::Time time;
-        time.type = [&](const std::string& type) -> Profile::Time::Type {
-            if (type == "absolute") {
-                return Profile::Time::Type::Absolute;
-            }
-            if (type == "relative") {
-                return Profile::Time::Type::Relative;
-            }
-            throw ProfileParsingError(
-                lineNumber,
-                fmt::format("Expected 'absolute' or 'relative' for the type, got {}", type)
-            );
-        }(fields[0]);
-        time.time = fields[1];
-        return time;
-    }
-
-    [[ nodiscard ]] double parseDeltaTime(const std::string& line, int lineNumber) {
-        try {
-            return std::stod(line);
-        }
-        catch (const std::invalid_argument&) {
-            throw ProfileParsingError(
-                lineNumber,
-                fmt::format("Expected a number for delta time entry, got '{}'", line)
-            );
-        }
-    }
-
-    [[ nodiscard ]] Profile::CameraType parseCamera(const std::string& line, int lineNumber) {
-        std::vector<std::string> fields = ghoul::tokenizeString(line, '\t');
-        Profile::CameraType camera = [&](const std::string& type) ->
-            std::variant<Profile::CameraNavState, Profile::CameraGoToGeo>
-        {
-            if (type == Profile::CameraNavState::Type) {
-                if (fields.size() != 8) {
-                    throw ProfileParsingError(
-                        lineNumber,
-                        fmt::format(
-                            "Expected 8 fields in the Camera entry, got {}", fields.size()
-                        )
-                    );
-                }
-
-                Profile::CameraNavState camera;
-                camera.anchor = fields[1];
-                camera.aim = fields[2];
-                camera.referenceFrame = fields[3];
-
-                std::vector<std::string> position = ghoul::tokenizeString(fields[4], ' ');
-                if (position.size() != 3) {
-                    throw ProfileParsingError(
-                        lineNumber,
-                        fmt::format(
-                            "Expected 3 fields for the camera's position, got {}",
-                            position.size()
-                        )
-                    );
-                }
-                try {
-                    camera.position = glm::dvec3(
-                        std::stod(position[0]),
-                        std::stod(position[1]),
-                        std::stod(position[2])
-                    );
-                }
-                catch (const std::invalid_argument&) {
-                    throw ProfileParsingError(
-                        lineNumber,
-                        "Camera's position components must be numbers"
-                    );
-                }
-
-                std::vector<std::string> up = ghoul::tokenizeString(fields[5], ' ');
-                if (up.size() != 0 && up.size() != 3) {
-                    throw ProfileParsingError(
-                        lineNumber,
-                        fmt::format(
-                            "Expected 0 or 3 fields for the camera's up vector, got {}",
-                            up.size()
-                        )
-                    );
-                }
-                if (up.size() == 3) {
-                    try {
-                        camera.up = glm::dvec3(
-                            std::stod(up[0]),
-                            std::stod(up[1]),
-                            std::stod(up[2])
-                        );
+            const nlohmann::json value = j[key];
+            if (!(value.*checkFunc)()) {
+                std::string type = [](auto c) {
+                    if (c == &nlohmann::json::is_string) { return "a string"; }
+                    else if (c == &nlohmann::json::is_number) { return "a number"; }
+                    else if (c == &nlohmann::json::is_object) { return "an object"; }
+                    else if (c == &nlohmann::json::is_array) { return "an array"; }
+                    else if (c == &nlohmann::json::is_boolean) { return "a boolean"; }
+                    else {
+                        throw ghoul::MissingCaseException();
                     }
-                    catch (const std::invalid_argument&) {
-                        throw ProfileParsingError(
-                            lineNumber,
-                            "Camera's up vector components must be numbers"
-                        );
-                    }
-                }
+                }(checkFunc);
 
-                if (!fields[6].empty()) {
-                    try {
-                        camera.yaw = std::stod(fields[6]);
-                    }
-                    catch (const std::invalid_argument&) {
-                        throw ProfileParsingError(
-                            lineNumber,
-                            "Camera's yaw value must be a number"
-                        );
-                    }
-                }
-
-                if (!fields[7].empty()) {
-                    try {
-                        camera.pitch = std::stod(fields[7]);
-                    }
-                    catch (const std::invalid_argument&) {
-                        throw ProfileParsingError(
-                            lineNumber,
-                            "Camera's pitch value must be a number"
-                        );
-                    }
-                }
-                return camera;
+                throw Profile::ParsingError(
+                    Profile::ParsingError::Severity::Error,
+                    fmt::format("'{}.{}' must be {}", keyPrefix, key, type)
+                );
             }
-            if (type == Profile::CameraGoToGeo::Type) {
-                if (fields.size() != 5) {
-                    throw ProfileParsingError(
-                        lineNumber,
-                        fmt::format(
-                            "Expected 5 fields in the Camera entry, got {}", fields.size()
-                        )
-                    );
-                }
-
-                Profile::CameraGoToGeo camera;
-                camera.anchor = fields[1];
-                camera.latitude = std::stod(fields[2]);
-                camera.longitude = std::stod(fields[3]);
-                if (!fields[4].empty()) {
-                    camera.altitude = std::stod(fields[4]);
-                }
-                return camera;
-            }
-            throw ProfileParsingError(
-                lineNumber,
-                fmt::format(
-                    "Expected 'setNavigationState' or 'goToGeo' for the type, got {}",
-                    fields[0]
-                )
-            );
-        }(fields[0]);
-
-        return camera;
+        }
     }
 
-    [[ nodiscard ]] std::string parseMarkNodes(const std::string& line, int) {
-        return line;
-    }
-
-    [[ nodiscard ]] std::string parseAdditionalScript(const std::string& line, int) {
-        return line;
+    void checkExtraKeys(const nlohmann::json& j, std::string_view prefix,
+                        const std::set<std::string>& allowedKeys)
+    {
+        for (auto& [key, _] : j.items()) {
+            if (allowedKeys.find(key) == allowedKeys.end()) {
+                LINFOC(
+                    "Profile",
+                    fmt::format("Key '{}' not supported in '{}'", key, prefix)
+                );
+            }
+        }
     }
 } // namespace
 
+void to_json(nlohmann::json& j, const Profile::Version& v) {
+    j["major"] = v.major;
+    j["minor"] = v.minor;
+}
+
+void from_json(const nlohmann::json& j, Profile::Version& v) {
+    checkValue(j, "major", &nlohmann::json::is_number, "version", false);
+    checkValue(j, "minor", &nlohmann::json::is_number, "version", false);
+    checkExtraKeys(j, "version", { "major", "minor" });
+
+    j["major"].get_to(v.major);
+    j["minor"].get_to(v.minor);
+}
+
+void to_json(nlohmann::json& j, const Profile::Module& v) {
+    j["name"] = v.name;
+    if (v.loadedInstruction.has_value()) {
+        j["loadedInstruction"] = *v.loadedInstruction;
+    }
+    if (v.notLoadedInstruction.has_value()) {
+        j["notLoadedInstruction"] = *v.notLoadedInstruction;
+    }
+}
+
+void from_json(const nlohmann::json& j, Profile::Module& v) {
+    checkValue(j, "name", &nlohmann::json::is_string, "module", false);
+    checkValue(j, "loadedInstruction", &nlohmann::json::is_string, "module", true);
+    checkValue(j, "notLoadedInstruction", &nlohmann::json::is_string, "module", true);
+    checkExtraKeys(j, "module", { "name", "loadedInstruction", "notLoadedInstruction" });
+
+    j["name"].get_to(v.name);
+    if (j.find("loadedInstruction") != j.end()) {
+        v.loadedInstruction = j["loadedInstruction"].get<std::string>();
+    }
+    if (j.find("notLoadedInstruction") != j.end()) {
+        v.notLoadedInstruction = j["notLoadedInstruction"].get<std::string>();
+    }
+}
+
+void to_json(nlohmann::json& j, const Profile::Meta& v) {
+    if (v.name.has_value()) {
+        j["name"] = *v.name;
+    }
+    if (v.version.has_value()) {
+        j["version"] = *v.version;
+    }
+    if (v.description.has_value()) {
+        j["description"] = *v.description;
+    }
+    if (v.author.has_value()) {
+        j["author"] = *v.author;
+    }
+    if (v.url.has_value()) {
+        j["url"] = *v.url;
+    }
+    if (v.license.has_value()) {
+        j["license"] = *v.license;
+    }
+}
+
+void from_json(const nlohmann::json& j, Profile::Meta& v) {
+    checkValue(j, "name", &nlohmann::json::is_string, "meta", true);
+    checkValue(j, "version", &nlohmann::json::is_string, "meta", true);
+    checkValue(j, "description", &nlohmann::json::is_string, "meta", true);
+    checkValue(j, "author", &nlohmann::json::is_string, "meta", true);
+    checkValue(j, "url", &nlohmann::json::is_string, "meta", true);
+    checkValue(j, "license", &nlohmann::json::is_string, "meta", true);
+    checkExtraKeys(
+        j,
+        "meta",
+        { "name", "version", "description", "author", "url", "license" }
+    );
+
+    if (j.find("name") != j.end()) {
+        v.name = j["name"].get<std::string>();
+    }
+    if (j.find("version") != j.end()) {
+        v.version = j["version"].get<std::string>();
+    }
+    if (j.find("description") != j.end()) {
+        v.description = j["description"].get<std::string>();
+    }
+    if (j.find("author") != j.end()) {
+        v.author = j["author"].get<std::string>();
+    }
+    if (j.find("url") != j.end()) {
+        v.url = j["url"].get<std::string>();
+    }
+    if (j.find("license") != j.end()) {
+        v.license = j["license"].get<std::string>();
+    }
+}
+
+void to_json(nlohmann::json& j, const Profile::Property::SetType& v) {
+    j = [](Profile::Property::SetType t) {
+        switch (t) {
+            case Profile::Property::SetType::SetPropertyValue:
+                return "setPropertyValue";
+            case Profile::Property::SetType::SetPropertyValueSingle:
+                return "setPropertyValueSingle";
+            default:
+                throw ghoul::MissingCaseException();
+        }
+    }(v);
+}
+
+void from_json(const nlohmann::json& j, Profile::Property::SetType& v) {
+    std::string value = j.get<std::string>();
+    if (value == "setPropertyValue") {
+        v = Profile::Property::SetType::SetPropertyValue;
+    }
+    else if (value == "setPropertyValueSingle") {
+        v = Profile::Property::SetType::SetPropertyValueSingle;
+    }
+    else {
+        throw Profile::ParsingError(
+            Profile::ParsingError::Severity::Error, "Unknown property set type"
+        );
+    }
+}
+
+void to_json(nlohmann::json& j, const Profile::Property& v) {
+    j["type"] = v.setType;
+    j["name"] = v.name;
+    j["value"] = v.value;
+}
+
+void from_json(const nlohmann::json& j, Profile::Property& v) {
+    checkValue(j, "type", &nlohmann::json::is_string, "property", false);
+    checkValue(j, "name", &nlohmann::json::is_string, "property", false);
+    checkValue(j, "value", &nlohmann::json::is_string, "property", false);
+    checkExtraKeys(j, "property", { "type", "name", "value" });
+
+    j["type"].get_to(v.setType);
+    j["name"].get_to(v.name);
+    j["value"].get_to(v.value);
+}
+
+void to_json(nlohmann::json& j, const Profile::Keybinding& v) {
+    j["key"] = ghoul::to_string(v.key);
+    j["documentation"] = v.documentation;
+    j["name"] = v.name;
+    j["gui_path"] = v.guiPath;
+    j["is_local"] = v.isLocal;
+    j["script"] = v.script;
+}
+
+void from_json(const nlohmann::json& j, Profile::Keybinding& v) {
+    checkValue(j, "key", &nlohmann::json::is_string, "keybinding", false);
+    checkValue(j, "documentation", &nlohmann::json::is_string, "keybinding", false);
+    checkValue(j, "name", &nlohmann::json::is_string, "keybinding", false);
+    checkValue(j, "gui_path", &nlohmann::json::is_string, "keybinding", false);
+    checkValue(j, "is_local", &nlohmann::json::is_boolean, "keybinding", false);
+    checkValue(j, "script", &nlohmann::json::is_string, "keybinding", false);
+    checkExtraKeys(
+        j,
+        "keybinding",
+        { "key", "documentation", "name", "gui_path", "is_local", "script" }
+    );
+
+    v.key = stringToKey(j.at("key").get<std::string>());
+    j["documentation"].get_to(v.documentation);
+    j["name"].get_to(v.name);
+    j["gui_path"].get_to(v.guiPath);
+    j["is_local"].get_to(v.isLocal);
+    j["script"].get_to(v.script);
+}
+
+void to_json(nlohmann::json& j, const Profile::Time::Type& v) {
+    j = [](Profile::Time::Type t) {
+        switch (t) {
+            case Profile::Time::Type::Absolute: return "absolute";
+            case Profile::Time::Type::Relative: return "relative";
+            default:                            throw ghoul::MissingCaseException();
+        }
+    }(v);
+}
+
+void from_json(const nlohmann::json& j, Profile::Time::Type& v) {
+    std::string value = j.get<std::string>();
+    if (value == "absolute") {
+        v = Profile::Time::Type::Absolute;
+    }
+    else if (value == "relative") {
+        v = Profile::Time::Type::Relative;
+    }
+    else {
+        throw Profile::ParsingError(
+            Profile::ParsingError::Severity::Error, "Unknown time type"
+        );
+    }
+}
+
+void to_json(nlohmann::json& j, const Profile::Time& v) {
+    j["type"] = v.type;
+    j["value"] = v.value;
+}
+
+void from_json(const nlohmann::json& j, Profile::Time& v) {
+    checkValue(j, "type", &nlohmann::json::is_string, "time", false);
+    checkValue(j, "value", &nlohmann::json::is_string, "time", false);
+    checkExtraKeys(j, "time", { "type", "value" });
+
+    j["type"].get_to(v.type);
+    j["value"].get_to(v.value);
+}
+
+void to_json(nlohmann::json& j, const Profile::CameraNavState& v) {
+    j["type"] = Profile::CameraNavState::Type;
+    j["anchor"] = v.anchor;
+    if (v.aim.has_value()) {
+        j["aim"] = *v.aim;
+    }
+    j["frame"] = v.referenceFrame;
+    nlohmann::json p {
+        { "x", v.position.x },
+        { "y", v.position.y },
+        { "z", v.position.z }
+    };
+    j["position"] = p;
+    if (v.up.has_value()) {
+        nlohmann::json u {
+            { "x", v.up->x },
+            { "y", v.up->y },
+            { "z", v.up->z }
+        };
+        j["up"] = u;
+    }
+    if (v.yaw.has_value()) {
+        j["yaw"] = *v.yaw;
+    }
+    if (v.pitch.has_value()) {
+        j["pitch"] = *v.pitch;
+    }
+}
+
+void from_json(const nlohmann::json& j, Profile::CameraNavState& v) {
+    ghoul_assert(
+        j.at("type").get<std::string>() == Profile::CameraNavState::Type,
+        "Wrong type for Camera"
+    );
+
+    checkValue(j, "anchor", &nlohmann::json::is_string, "camera", false);
+    checkValue(j, "aim", &nlohmann::json::is_string, "camera", true);
+    checkValue(j, "frame", &nlohmann::json::is_string, "camera", false);
+    checkValue(j, "position", &nlohmann::json::is_object, "camera", false);
+    checkValue(j["position"], "x", &nlohmann::json::is_number, "camera.position", false);
+    checkValue(j["position"], "y", &nlohmann::json::is_number, "camera.position", false);
+    checkValue(j["position"], "z", &nlohmann::json::is_number, "camera.position", false);
+    checkExtraKeys(j["position"], "camera.position", { "x", "y", "z" });
+    checkValue(j, "up", &nlohmann::json::is_object, "camera", true);
+    if (j.find("up") != j.end()) {
+        checkValue(j["up"], "x", &nlohmann::json::is_number, "camera.up", false);
+        checkValue(j["up"], "y", &nlohmann::json::is_number, "camera.up", false);
+        checkValue(j["up"], "z", &nlohmann::json::is_number, "camera.up", false);
+        checkExtraKeys(j["up"], "camera.up", { "x", "y", "z" });
+    }
+    checkValue(j, "yaw", &nlohmann::json::is_number, "camera", true);
+    checkValue(j, "pitch", &nlohmann::json::is_number, "camera", true);
+    checkExtraKeys(
+        j,
+        "camera",
+        { "type", "anchor", "aim", "frame", "position", "up", "yaw", "pitch" }
+    );
+
+    j["anchor"].get_to(v.anchor);
+    if (j.find("aim") != j.end()) {
+        v.aim = j["aim"].get<std::string>();
+    }
+    j["frame"].get_to(v.referenceFrame);
+    nlohmann::json p = j["position"];
+    p["x"].get_to(v.position.x);
+    p["y"].get_to(v.position.y);
+    p["z"].get_to(v.position.z);
+
+    if (j.find("up") != j.end()) {
+        nlohmann::json u = j["up"];
+        glm::dvec3 up;
+        u["x"].get_to(up.x);
+        u["y"].get_to(up.y);
+        u["z"].get_to(up.z);
+        v.up = up;
+    }
+
+    if (j.find("yaw") != j.end()) {
+        v.yaw = j["yaw"].get<double>();
+    }
+
+    if (j.find("pitch") != j.end()) {
+        v.pitch = j["pitch"].get<double>();
+    }
+}
+
+void to_json(nlohmann::json& j, const Profile::CameraGoToGeo& v) {
+    j["type"] = Profile::CameraGoToGeo::Type;
+    j["anchor"] = v.anchor;
+    j["latitude"] = v.latitude;
+    j["longitude"] = v.longitude;
+    if (v.altitude.has_value()) {
+        j["altitude"] = *v.altitude;
+    }
+}
+
+void from_json(const nlohmann::json& j, Profile::CameraGoToGeo& v) {
+    ghoul_assert(
+        j.at("type").get<std::string>() == Profile::CameraGoToGeo::Type,
+        "Wrong type for Camera"
+    );
+
+    checkValue(j, "anchor", &nlohmann::json::is_string, "camera", false);
+    checkValue(j, "latitude", &nlohmann::json::is_number, "camera", false);
+    checkValue(j, "longitude", &nlohmann::json::is_number, "camera", false);
+    checkValue(j, "altitude", &nlohmann::json::is_number, "camera", true);
+    checkExtraKeys(
+        j,
+        "camera",
+        { "type", "anchor", "latitude", "longitude", "altitude" }
+    );
+
+    j["anchor"].get_to(v.anchor);
+    j["latitude"].get_to(v.latitude);
+    j["longitude"].get_to(v.longitude);
+
+    if (j.find("altitude") != j.end()) {
+        v.altitude = j["altitude"].get<double>();
+    }
+}
+
+Profile::ParsingError::ParsingError(Severity severity_, std::string msg)
+    : ghoul::RuntimeError(std::move(msg), "profileFile")
+    , severity(severity_)
+{}
+
 void Profile::saveCurrentSettingsToProfile(const properties::PropertyOwner& rootOwner,
                                            std::string currentTime,
                                  interaction::NavigationHandler::NavigationState navState)
@@ -491,9 +466,9 @@ void Profile::saveCurrentSettingsToProfile(const properties::PropertyOwner& root
     // add current time to profile file
     //
     Time t;
-    t.time = std::move(currentTime);
+    t.value = std::move(currentTime);
     t.type = Time::Type::Absolute;
-    time = std::move(t);
+    time = t;
 
     // Delta times
     std::vector<double> dts = global::timeManager.deltaTimeSteps();
@@ -523,20 +498,14 @@ void Profile::addAsset(const std::string& path) {
         return;
     }
 
-    const auto it = std::find_if(
-        assets.begin(),
-        assets.end(),
-        [path](const Asset& a) { return a.path == path; }
-    );
+    const auto it = std::find(assets.cbegin(), assets.cend(), path);
 
     if (it != assets.end()) {
         // Asset already existed, so nothing to do here
         return;
     }
 
-    Asset a;
-    a.path = path;
-    assets.push_back(std::move(a));
+    assets.push_back(path);
 }
 
 void Profile::removeAsset(const std::string& path) {
@@ -546,11 +515,7 @@ void Profile::removeAsset(const std::string& path) {
         return;
     }
 
-    const auto it = std::find_if(
-        assets.cbegin(),
-        assets.cend(),
-        [path](const Asset& a) { return a.path == path; }
-    );
+    const auto it = std::find(assets.cbegin(), assets.cend(), path);
 
     if (it == assets.end()) {
         throw ghoul::RuntimeError(fmt::format(
@@ -585,358 +550,105 @@ scripting::LuaLibrary Profile::luaLibrary() {
 }
 
 std::string Profile::serialize() const {
-    std::string output;
-    output += fmt::format("{}\n", headerVersion);
-    output += fmt::format("{}.{}\n", version.major, version.minor);
-
-    if (meta.has_value()) {
-        output += fmt::format("\n{}\n", headerMeta);
-        if (!meta->name.empty()) {
-            output += fmt::format("Name\t{}\n", meta->name);
-        }
-        if (!meta->version.empty()) {
-            output += fmt::format("Version\t{}\n", meta->version);
-        }
-        if (!meta->description.empty()) {
-            output += fmt::format("Description\t{}\n", meta->description);
-        }
-        if (!meta->author.empty()) {
-            output += fmt::format("Author\t{}\n", meta->author);
-        }
-        if (!meta->url.empty()) {
-            output += fmt::format("URL\t{}\n", meta->url);
-        }
-        if (!meta->license.empty()) {
-            output += fmt::format("License\t{}\n", meta->license);
-        }
-    }
-
+    nlohmann::json r;
+    r["version"] = version;
     if (!modules.empty()) {
-        output += fmt::format("\n{}\n", headerModule);
-        for (const Module& m : modules) {
-            output += fmt::format(
-                "{}\t{}\t{}\n",
-                m.name, m.loadedInstruction, m.notLoadedInstruction
-            );
-        }
+        r["modules"] = modules;
+    }
+    if (meta.has_value()) {
+        r["meta"] = *meta;
     }
-
     if (!assets.empty()) {
-        output += fmt::format("\n{}\n", headerAsset);
-        for (const Asset& a : assets) {
-            output += fmt::format("{}\t{}\n", a.path, a.name);
-        }
+        r["assets"] = assets;
     }
-
     if (!properties.empty()) {
-        output += fmt::format("\n{}\n", headerProperty);
-        for (const Property& p : properties) {
-            const std::string type = [](Property::SetType t) {
-                switch (t) {
-                    case Property::SetType::SetPropertyValue:
-                        return "setPropertyValue";
-                    case Property::SetType::SetPropertyValueSingle:
-                        return "setPropertyValueSingle";
-                    default:
-                        throw ghoul::MissingCaseException();
-                }
-            }(p.setType);
-            output += fmt::format("{}\t{}\t{}\n", type, p.name, p.value);
-        }
+        r["properties"] = properties;
     }
-
     if (!keybindings.empty()) {
-        output += fmt::format("\n{}\n", headerKeybinding);
-        for (const Keybinding& k : keybindings) {
-            const std::string key = ghoul::to_string(k.key);
-            const std::string local = k.isLocal ? "true" : "false";
-            output += fmt::format(
-                "{}\t{}\t{}\t{}\t{}\t{}\n",
-                key, k.documentation, k.name, k.guiPath, local, k.script
-            );
-        }
+        r["keybindings"] = keybindings;
     }
-    
     if (time.has_value()) {
-        output += fmt::format("\n{}\n", headerTime);
-        {
-            const std::string type = [](Time::Type t) {
-                switch (t) {
-                    case Time::Type::Absolute: return "absolute";
-                    case Time::Type::Relative: return "relative";
-                    default: throw ghoul::MissingCaseException();
-                }
-            }(time->type);
-            output += fmt::format("{}\t{}\n", type, time->time);
-        }
+        r["time"] = *time;
     }
-
     if (!deltaTimes.empty()) {
-        output += fmt::format("\n{}\n", headerDeltaTimes);
-        for (const double d : deltaTimes) {
-            output += fmt::format("{}\n", d);
-        }
+        r["delta_times"] = deltaTimes;
     }
-
     if (camera.has_value()) {
-        output += fmt::format("\n{}\n", headerCamera);
-        output += std::visit(
+        r["camera"] = std::visit(
             overloaded {
                 [](const CameraNavState& camera) {
-                    std::string position = fmt::format(
-                        "{}, {}, {}",
-                        camera.position.x, camera.position.y, camera.position.z
-                    );
-                    std::string up = camera.up.has_value() ?
-                        fmt::format(
-                            "{}, {}, {}", camera.up->x, camera.up->y, camera.up->z
-                        ) :
-                        "";
-                    std::string yaw = camera.yaw.has_value() ?
-                        fmt::format("{}", *camera.yaw) :
-                        "";
-                    std::string pitch = camera.pitch.has_value() ?
-                        fmt::format("{}", *camera.pitch) :
-                        "";
-
-                    return fmt::format(
-                        "{}\t{}\t{}\t{}\t{}\t{}\t{}\t{}\n",
-                        CameraNavState::Type,
-                        camera.anchor, camera.aim, camera.referenceFrame, position, up,
-                        yaw, pitch
-                    );
+                    return nlohmann::json(camera);
                 },
                 [](const Profile::CameraGoToGeo& camera) {
-                    if (camera.altitude.has_value()) {
-                        return fmt::format(
-                            "{}\t{}\t{}\t{}\t{}\n",
-                            CameraGoToGeo::Type,
-                            camera.anchor, camera.latitude, camera.longitude,
-                            *camera.altitude
-                        );
-                    }
-                    else {
-                        return fmt::format(
-                            "{}\t{}\t{}\t{}\t\n",
-                            CameraGoToGeo::Type,
-                            camera.anchor, camera.latitude, camera.longitude
-                        );
-                    }
+                    return nlohmann::json(camera);
                 }
             },
             *camera
         );
     }
-
     if (!markNodes.empty()) {
-        output += fmt::format("\n{}\n", headerMarkNodes);
-        for (const std::string& n : markNodes) {
-            output += fmt::format("{}\n", n);
-        }
+        r["mark_nodes"] = markNodes;
     }
-
     if (!additionalScripts.empty()) {
-        output += fmt::format("\n{}\n", headerAdditionalScripts);
-        for (const std::string& s : additionalScripts) {
-            output += fmt::format("{}\n", s);
-        }
+        r["additional_scripts"] = additionalScripts;
     }
 
-    return output;
+    return r.dump(2);
 }
 
-Profile::Profile(const std::vector<std::string>& content) {
-    Section currentSection = Section::None;
-    bool foundVersion = false;
-    bool foundMeta = false;
-    bool foundTime = false;
-    bool foundCamera = false;
+Profile::Profile(const std::string& content) {
+    try {
+        nlohmann::json profile = nlohmann::json::parse(content);
 
-    for (int lineNum = 1; lineNum <= static_cast<int>(content.size()); ++lineNum) {
-        std::string line = content[lineNum - 1];
-        if (std::all_of(line.begin(), line.end(), ::isspace)) {
-            currentSection = Section::None;
-            continue;
+        profile.at("version").get_to(version);
+        if (profile.find("modules") != profile.end()) {
+            profile["modules"].get_to(modules);
         }
-
-        if (currentSection != Section::None && line[0] == '#') {
-            throw ProfileParsingError(
-                lineNum,
-                "Sections in profile must be separated by empty lines"
-            );
+        if (profile.find("meta") != profile.end()) {
+            meta = profile.at("meta").get<Meta>();
         }
-
-        switch (currentSection) {
-            case Section::None:
-                currentSection = parseSection(line, lineNum);
-
-                if (!foundVersion && currentSection != Section::Version) {
-                    throw ProfileParsingError(
-                        lineNum,
-                        fmt::format(
-                            "First header in the file must be Version, but got {}", line
-                        )
-                    );
-                }
-
-                if (currentSection == Section::Meta && foundMeta) {
-                    throw ProfileParsingError(
-                        lineNum,
-                        "Meta section can only appear once per profile"
-                    );
-                }
-                break;
-            case Section::Version:
-                if (foundVersion) {
-                    throw ProfileParsingError(
-                        lineNum,
-                        "Version section can only appear once per profile"
-                    );
-                }
-
-                version = parseVersion(line, lineNum);
-                foundVersion = true;
-                break;
-            case Section::Meta:
-            {
-                if (!meta.has_value()) {
-                    meta = Meta();
-                }
-
-                std::pair<MetaLineType, std::string> m = parseMeta(line, lineNum);
-                switch (m.first) {
-                    case MetaLineType::Name:
-                        if (!meta->name.empty()) {
-                            throw ProfileParsingError(
-                                lineNum,
-                                "Meta information 'Name' specified twice"
-                            );
-                        }
-                        meta->name = m.second;
-                        break;
-                    case MetaLineType::Version:
-                        if (!meta->version.empty()) {
-                            throw ProfileParsingError(
-                                lineNum,
-                                "Meta information 'Version' specified twice"
-                            );
-                        }
-                        meta->version = m.second;
-                        break;
-                    case MetaLineType::Description:
-                        if (!meta->description.empty()) {
-                            throw ProfileParsingError(
-                                lineNum,
-                                "Meta information 'Description' specified twice"
-                            );
-                        }
-                        meta->description = m.second;
-                        break;
-                    case MetaLineType::Author:
-                        if (!meta->author.empty()) {
-                            throw ProfileParsingError(
-                                lineNum,
-                                "Meta information 'Author' specified twice"
-                            );
-                        }
-                        meta->author = m.second;
-                        break;
-                    case MetaLineType::URL:
-                        if (!meta->url.empty()) {
-                            throw ProfileParsingError(
-                                lineNum,
-                                "Meta information 'URL' specified twice"
-                            );
-                        }
-                        meta->url = m.second;
-                        break;
-                    case MetaLineType::License:
-                        if (!meta->license.empty()) {
-                            throw ProfileParsingError(
-                                lineNum,
-                                "Meta information 'License' specified twice"
-                            );
-                        }
-                        meta->license = m.second;
-                        break;
-                    default:
-                        throw ghoul::MissingCaseException();
-                }
-                foundMeta = true;
-                break;
+        if (profile.find("assets") != profile.end()) {
+            profile.at("assets").get_to(assets);
+        }
+        if (profile.find("properties") != profile.end()) {
+            profile.at("properties").get_to(properties);
+        }
+        if (profile.find("keybindings") != profile.end()) {
+            profile.at("keybindings").get_to(keybindings);
+        }
+        if (profile.find("time") != profile.end()) {
+            time = profile.at("time").get<Time>();
+        }
+        if (profile.find("delta_times") != profile.end()) {
+            profile.at("delta_times").get_to(deltaTimes);
+        }
+        if (profile.find("camera") != profile.end()) {
+            nlohmann::json c = profile.at("camera");
+            if (c.at("type") == CameraNavState::Type) {
+                camera = c.get<CameraNavState>();
             }
-            case Section::Module:
-            {
-                Module m = parseModule(line, lineNum);
-                modules.push_back(std::move(m));
-                break;
+            else if (c.at("type") == CameraGoToGeo::Type) {
+                camera = c.get<CameraGoToGeo>();
             }
-            case Section::Asset:
-            {
-                Asset a = parseAsset(line, lineNum);
-                assets.push_back(std::move(a));
-                break;
+            else {
+                throw Profile::ParsingError(
+                    Profile::ParsingError::Severity::Error,
+                    "Unknown camera type"
+                );
             }
-            case Section::Property:
-            {
-                Property p = parseProperty(line, lineNum);
-                properties.push_back(std::move(p));
-                break;
-            }
-            case Section::Keybinding:
-            {
-                Keybinding kb = parseKeybinding(line, lineNum);
-                keybindings.push_back(std::move(kb));
-                break;
-            }
-            case Section::Time:
-                if (foundTime) {
-                    throw ProfileParsingError(
-                        lineNum,
-                        "Time section can only appear once per profile"
-                    );
-                }
-
-                time = parseTime(line, lineNum);
-                foundTime = true;
-                break;
-            case Section::DeltaTimes:
-            {
-                const double d = parseDeltaTime(line, lineNum);
-                deltaTimes.push_back(d);
-                break;
-            }
-            case Section::Camera:
-                if (foundCamera) {
-                    throw ProfileParsingError(
-                        lineNum,
-                        "Camera section can only appear once per profile"
-                    );
-                }
-
-                camera = parseCamera(line, lineNum);
-                foundCamera = true;
-                break;
-            case Section::MarkNodes:
-            {
-                std::string m = parseMarkNodes(line, lineNum);
-                markNodes.push_back(std::move(m));
-                break;
-            }
-            case Section::AdditionalScripts:
-            {
-                std::string a = parseAdditionalScript(line, lineNum);
-                additionalScripts.push_back(std::move(a));
-                break;
-            }
-            default:
-                throw ghoul::MissingCaseException();
+        }
+        if (profile.find("mark_nodes") != profile.end()) {
+            profile.at("mark_nodes").get_to(markNodes);
+        }
+        if (profile.find("additional_scripts") != profile.end()) {
+            profile.at("additional_scripts").get_to(additionalScripts);
         }
     }
-
-    if (!foundVersion) {
-        throw ghoul::RuntimeError(
-            "Did not find Version information when loading profile"
+    catch (const nlohmann::json::exception& e) {
+        std::string err = e.what();
+        throw Profile::ParsingError(
+            Profile::ParsingError::Severity::Error,
+            err
         );
     }
 }
@@ -948,23 +660,23 @@ std::string Profile::convertToScene() const {
 
     if (meta.has_value()) {
         output += "asset.meta = {";
-        if (!meta->name.empty()) {
-            output += fmt::format("  Name = {},", meta->name);
+        if (meta->name.has_value()) {
+            output += fmt::format("  Name = {},", *meta->name);
         }
-        if (!meta->version.empty()) {
-            output += fmt::format("  Version = {},", meta->version);
+        if (meta->version.has_value()) {
+            output += fmt::format("  Version = {},", *meta->version);
         }
-        if (!meta->description.empty()) {
-            output += fmt::format("  Description = {},", meta->description);
+        if (meta->description.has_value()) {
+            output += fmt::format("  Description = {},", *meta->description);
         }
-        if (!meta->author.empty()) {
-            output += fmt::format("  Author = {},", meta->author);
+        if (meta->author.has_value()) {
+            output += fmt::format("  Author = {},", *meta->author);
         }
-        if (!meta->url.empty()) {
-            output += fmt::format("  URL = {},", meta->url);
+        if (meta->url.has_value()) {
+            output += fmt::format("  URL = {},", *meta->url);
         }
-        if (!meta->license.empty()) {
-            output += fmt::format("  License = {},", meta->license);
+        if (meta->license.has_value()) {
+            output += fmt::format("  License = {},", *meta->license);
         }
 
         output += "}";
@@ -974,18 +686,13 @@ std::string Profile::convertToScene() const {
     for (const Module& m : modules) {
         output += fmt::format(
             "if openspace.modules.isLoaded(\"{}\") then {} else {} end\n",
-            m.name, m.loadedInstruction, m.notLoadedInstruction
+            m.name, *m.loadedInstruction, *m.notLoadedInstruction
         );
     }
 
     // Assets
-    for (const Asset& a : assets) {
-        if (a.name.empty()) {
-            output += fmt::format("asset.require(\"{}\");\n", a.path);
-        }
-        else {
-            output += fmt::format("local {} = asset.require(\"{}\");\n", a.name, a.path);
-        }
+    for (const std::string& asset : assets) {
+        output += fmt::format("asset.require(\"{}\");\n", asset);
     }
 
     output += "asset.onInitialize(function()\n";
@@ -1004,12 +711,12 @@ std::string Profile::convertToScene() const {
     // Time
     switch (time->type) {
         case Time::Type::Absolute:
-            output += fmt::format("openspace.time.setTime(\"{}\")\n", time->time);
+            output += fmt::format("openspace.time.setTime(\"{}\")\n", time->value);
             break;
         case Time::Type::Relative:
             output += "local now = openspace.time.currentWallTime();\n";
             output += fmt::format(
-                "local prev = openspace.time.advancedTime(now, \"{}\");\n", time->time
+                "local prev = openspace.time.advancedTime(now, \"{}\");\n", time->value
             );
             output += "openspace.time.setTime(prev);\n";
             break;
@@ -1062,12 +769,14 @@ std::string Profile::convertToScene() const {
                 [](const CameraNavState& camera) {
                     std::string result;
                     result += "openspace.navigation.setNavigationState({";
-                    result += fmt::format("Anchor = {}, ", camera.anchor);
-                    if (!camera.aim.empty()) {
-                        result += fmt::format("Aim = {}, ", camera.aim);
+                    result += fmt::format("Anchor = [[{}]], ", camera.anchor);
+                    if (camera.aim.has_value()) {
+                        result += fmt::format("Aim = [[{}]], ", *camera.aim);
                     }
                     if (!camera.referenceFrame.empty()) {
-                        result += fmt::format("ReferenceFrame = {}, ", camera.referenceFrame);
+                        result += fmt::format(
+                            "ReferenceFrame = [[{}]], ", camera.referenceFrame
+                        );
                     }
                     result += fmt::format(
                         "Position = {{ {}, {}, {} }}, ",
@@ -1091,13 +800,13 @@ std::string Profile::convertToScene() const {
                 [](const CameraGoToGeo& camera) {
                     if (camera.altitude.has_value()) {
                         return fmt::format(
-                            "openspace.globebrowsing.goToGeo({}, {}, {}, {});\n",
+                            "openspace.globebrowsing.goToGeo([[{}]], {}, {}, {});\n",
                             camera.anchor, camera.latitude, camera.longitude, *camera.altitude
                         );
                     }
                     else {
                         return fmt::format(
-                            "openspace.globebrowsing.goToGeo({}, {}, {});\n",
+                            "openspace.globebrowsing.goToGeo([[{}]], {}, {});\n",
                             camera.anchor, camera.latitude, camera.longitude
                         );
                     }
@@ -1116,5 +825,4 @@ std::string Profile::convertToScene() const {
     return output;
 }
 
-
 }  // namespace openspace
diff --git a/src/util/time.cpp b/src/util/time.cpp
index e0be6096eb..9c0820aaf5 100644
--- a/src/util/time.cpp
+++ b/src/util/time.cpp
@@ -108,8 +108,7 @@ std::string_view Time::ISO8601() const {
     std::memset(b, 0, S);
 
     SpiceManager::ref().dateFromEphemerisTime(_time, b, S, Format);
-
-    return std::string_view(b, S-1);
+    return std::string_view(b, S - 1);
 }
 
 void Time::ISO8601(char* buffer) const {
diff --git a/tests/profile/basic/additional_scripts.profile b/tests/profile/basic/additional_scripts.profile
new file mode 100644
index 0000000000..f163d76fdc
--- /dev/null
+++ b/tests/profile/basic/additional_scripts.profile
@@ -0,0 +1,8 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "additional_scripts": [
+    "script-1",
+    "script-2",
+    "script-3"
+    ]
+}
diff --git a/tests/profile/basic/assets.profile b/tests/profile/basic/assets.profile
new file mode 100644
index 0000000000..2f143742ed
--- /dev/null
+++ b/tests/profile/basic/assets.profile
@@ -0,0 +1,8 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "assets": [
+    "folder1/folder2/asset",
+    "folder3/folder4/asset2",
+    "folder5/folder6/asset3"
+  ]
+}
diff --git a/tests/profile/basic/camera_gotogeo.profile b/tests/profile/basic/camera_gotogeo.profile
new file mode 100644
index 0000000000..e63ad42445
--- /dev/null
+++ b/tests/profile/basic/camera_gotogeo.profile
@@ -0,0 +1,9 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "goToGeo",
+    "anchor": "anchor",
+    "latitude": 1.0,
+    "longitude": 2.0
+  }
+}
diff --git a/tests/profile/basic/camera_gotogeo_altitude.profile b/tests/profile/basic/camera_gotogeo_altitude.profile
new file mode 100644
index 0000000000..fb4f79101b
--- /dev/null
+++ b/tests/profile/basic/camera_gotogeo_altitude.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "goToGeo",
+    "anchor": "anchor",
+    "latitude": 1.0,
+    "longitude": 2.0,
+    "altitude": 4.0
+  }
+}
diff --git a/tests/profile/basic/camera_navstate_full.profile b/tests/profile/basic/camera_navstate_full.profile
new file mode 100644
index 0000000000..2dab932a51
--- /dev/null
+++ b/tests/profile/basic/camera_navstate_full.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/basic/camera_navstate_no_aim.profile b/tests/profile/basic/camera_navstate_no_aim.profile
new file mode 100644
index 0000000000..c224a42fef
--- /dev/null
+++ b/tests/profile/basic/camera_navstate_no_aim.profile
@@ -0,0 +1,12 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/basic/camera_navstate_no_pitch.profile b/tests/profile/basic/camera_navstate_no_pitch.profile
new file mode 100644
index 0000000000..4f4228a0b4
--- /dev/null
+++ b/tests/profile/basic/camera_navstate_no_pitch.profile
@@ -0,0 +1,12 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0
+  }
+}
diff --git a/tests/profile/basic/camera_navstate_no_up.profile b/tests/profile/basic/camera_navstate_no_up.profile
new file mode 100644
index 0000000000..fd5fd3488c
--- /dev/null
+++ b/tests/profile/basic/camera_navstate_no_up.profile
@@ -0,0 +1,12 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0},
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/basic/camera_navstate_no_yaw.profile b/tests/profile/basic/camera_navstate_no_yaw.profile
new file mode 100644
index 0000000000..4f378f6332
--- /dev/null
+++ b/tests/profile/basic/camera_navstate_no_yaw.profile
@@ -0,0 +1,12 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/basic/deltatimes.profile b/tests/profile/basic/deltatimes.profile
new file mode 100644
index 0000000000..564d64bef6
--- /dev/null
+++ b/tests/profile/basic/deltatimes.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "delta_times": [
+    1.0,
+    30.0,
+    60.0,
+    1000.0,
+    36000.0
+  ]
+}
diff --git a/tests/profile/basic/keybindings.profile b/tests/profile/basic/keybindings.profile
new file mode 100644
index 0000000000..a038c3b72f
--- /dev/null
+++ b/tests/profile/basic/keybindings.profile
@@ -0,0 +1,29 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "T",
+      "documentation": "T documentation",
+      "name": "T name",
+      "gui_path": "T Gui-Path",
+      "is_local": true,
+      "script": "T script"
+    },
+    {
+      "key": "U",
+      "documentation": "U documentation",
+      "name": "U name",
+      "gui_path": "U Gui-Path",
+      "is_local": false,
+      "script": "U script"
+    },
+    {
+      "key": "CTRL+V",
+      "documentation": "CTRL+V documentation",
+      "name": "CTRL+V name",
+      "gui_path": "CTRL+V Gui-Path",
+      "is_local": false,
+      "script": "CTRL+V script"
+    }
+  ]
+}
diff --git a/tests/profile/basic/mark_nodes.profile b/tests/profile/basic/mark_nodes.profile
new file mode 100644
index 0000000000..8a7d63a5b2
--- /dev/null
+++ b/tests/profile/basic/mark_nodes.profile
@@ -0,0 +1,6 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "mark_nodes": [
+    "node-1", "node-2", "node-3"
+  ]
+}
diff --git a/tests/profile/basic/meta_empty.profile b/tests/profile/basic/meta_empty.profile
new file mode 100644
index 0000000000..60bb83a02a
--- /dev/null
+++ b/tests/profile/basic/meta_empty.profile
@@ -0,0 +1,11 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "meta": {
+    "name": "name",
+    "version": "version",
+    "description": "description",
+    "author": "author",
+    "url": "url",
+    "license": "license"
+  }
+}
diff --git a/tests/profile/basic/meta_full.profile b/tests/profile/basic/meta_full.profile
new file mode 100644
index 0000000000..60bb83a02a
--- /dev/null
+++ b/tests/profile/basic/meta_full.profile
@@ -0,0 +1,11 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "meta": {
+    "name": "name",
+    "version": "version",
+    "description": "description",
+    "author": "author",
+    "url": "url",
+    "license": "license"
+  }
+}
diff --git a/tests/profile/basic/meta_no_author.profile b/tests/profile/basic/meta_no_author.profile
new file mode 100644
index 0000000000..9d7ed8afc8
--- /dev/null
+++ b/tests/profile/basic/meta_no_author.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "meta": {
+    "name": "name",
+    "version": "version",
+    "description": "description",
+    "url": "url",
+    "license": "license"
+  }
+}
diff --git a/tests/profile/basic/meta_no_description.profile b/tests/profile/basic/meta_no_description.profile
new file mode 100644
index 0000000000..a9a8883404
--- /dev/null
+++ b/tests/profile/basic/meta_no_description.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "meta": {
+    "name": "name",
+    "version": "version",
+    "author": "author",
+    "url": "url",
+    "license": "license"
+  }
+}
diff --git a/tests/profile/basic/meta_no_license.profile b/tests/profile/basic/meta_no_license.profile
new file mode 100644
index 0000000000..e20341449a
--- /dev/null
+++ b/tests/profile/basic/meta_no_license.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "meta": {
+    "name": "name",
+    "version": "version",
+    "description": "description",
+    "author": "author",
+    "url": "url"
+  }
+}
diff --git a/tests/profile/basic/meta_no_name.profile b/tests/profile/basic/meta_no_name.profile
new file mode 100644
index 0000000000..3f7dd60baf
--- /dev/null
+++ b/tests/profile/basic/meta_no_name.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "meta": {
+    "version": "version",
+    "description": "description",
+    "author": "author",
+    "url": "url",
+    "license": "license"
+  }
+}
diff --git a/tests/profile/basic/meta_no_url.profile b/tests/profile/basic/meta_no_url.profile
new file mode 100644
index 0000000000..06bc81189a
--- /dev/null
+++ b/tests/profile/basic/meta_no_url.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "meta": {
+    "name": "name",
+    "version": "version",
+    "description": "description",
+    "author": "author",
+    "license": "license"
+  }
+}
diff --git a/tests/profile/basic/meta_no_version.profile b/tests/profile/basic/meta_no_version.profile
new file mode 100644
index 0000000000..a9903f70df
--- /dev/null
+++ b/tests/profile/basic/meta_no_version.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "meta": {
+    "name": "name",
+    "description": "description",
+    "author": "author",
+    "url": "url",
+    "license": "license"
+  }
+}
diff --git a/tests/profile/basic/modules.profile b/tests/profile/basic/modules.profile
new file mode 100644
index 0000000000..85b943192f
--- /dev/null
+++ b/tests/profile/basic/modules.profile
@@ -0,0 +1,19 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "modules": [
+    { "name": "abs-module" },
+    {
+      "name": "def-module",
+      "loadedInstruction": "instr"
+    },
+    {
+      "name": "ghi-module",
+      "notLoadedInstruction": "not_instr"
+    },
+    {
+      "name": "jkl-module",
+      "loadedInstruction": "instr",
+      "notLoadedInstruction": "not_instr"
+    }
+  ]
+}
diff --git a/tests/profile/basic/properties.profile b/tests/profile/basic/properties.profile
new file mode 100644
index 0000000000..de8b8f6197
--- /dev/null
+++ b/tests/profile/basic/properties.profile
@@ -0,0 +1,35 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "properties": [
+    {
+      "type": "setPropertyValue",
+      "name": "property_name_1",
+      "value": "property_value_1"
+    },
+    {
+      "type": "setPropertyValue",
+      "name": "property_name_2",
+      "value": "property_value_2"
+    },
+    {
+      "type": "setPropertyValue",
+      "name": "property_name_3",
+      "value": "property_value_3"
+    },
+    {
+      "type": "setPropertyValueSingle",
+      "name": "property_name_4",
+      "value": "property_value_4"
+    },
+    {
+      "type": "setPropertyValueSingle",
+      "name": "property_name_5",
+      "value": "property_value_5"
+    },
+    {
+      "type": "setPropertyValueSingle",
+      "name": "property_name_6",
+      "value": "property_value_6"
+    }
+  ]
+}
diff --git a/tests/profile/basic/time_absolute.profile b/tests/profile/basic/time_absolute.profile
new file mode 100644
index 0000000000..5b051fbc69
--- /dev/null
+++ b/tests/profile/basic/time_absolute.profile
@@ -0,0 +1,7 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "time": {
+    "type": "absolute",
+    "value": "2020-06-01T12:00:00"
+  }
+}
diff --git a/tests/profile/basic/time_relative.profile b/tests/profile/basic/time_relative.profile
new file mode 100644
index 0000000000..34b1048d29
--- /dev/null
+++ b/tests/profile/basic/time_relative.profile
@@ -0,0 +1,7 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "time": {
+    "type": "relative",
+    "value": "-1d"
+  }
+}
diff --git a/tests/profile/basic_additional_scripts.profile b/tests/profile/basic_additional_scripts.profile
deleted file mode 100644
index ba6b944989..0000000000
--- a/tests/profile/basic_additional_scripts.profile
+++ /dev/null
@@ -1,7 +0,0 @@
-#Version
-12.13
-
-#AdditionalScripts
-script-1
-script-2
-script-3
diff --git a/tests/profile/basic_assets.profile b/tests/profile/basic_assets.profile
deleted file mode 100644
index 89f6238c1e..0000000000
--- a/tests/profile/basic_assets.profile
+++ /dev/null
@@ -1,7 +0,0 @@
-#Version
-12.13
-
-#Asset
-folder1/folder2/asset	
-folder3/folder4/asset2	variable
-folder5/folder6/asset3	
diff --git a/tests/profile/basic_camera_gotogeo.profile b/tests/profile/basic_camera_gotogeo.profile
deleted file mode 100644
index ec048ba679..0000000000
--- a/tests/profile/basic_camera_gotogeo.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-goToGeo	"anchor"	1.0	2.0	
diff --git a/tests/profile/basic_camera_gotogeo_altitude.profile b/tests/profile/basic_camera_gotogeo_altitude.profile
deleted file mode 100644
index 1e2d0f8ba4..0000000000
--- a/tests/profile/basic_camera_gotogeo_altitude.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-goToGeo	"anchor"	1.0	2.0	4.0
diff --git a/tests/profile/basic_camera_navstate.profile b/tests/profile/basic_camera_navstate.profile
deleted file mode 100644
index 678bd650f7..0000000000
--- a/tests/profile/basic_camera_navstate.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-setNavigationState	"node"		"root"	1.0, 2.0, 3.0	4.0, 5.0, 6.0	10.0	-10.0
diff --git a/tests/profile/basic_deltatimes.profile b/tests/profile/basic_deltatimes.profile
deleted file mode 100644
index 11ea8d2edf..0000000000
--- a/tests/profile/basic_deltatimes.profile
+++ /dev/null
@@ -1,9 +0,0 @@
-#Version
-12.13
-
-#DeltaTimes
-1.0
-30.0
-60.0
-1000.0
-36000.0
diff --git a/tests/profile/basic_keybindings.profile b/tests/profile/basic_keybindings.profile
deleted file mode 100644
index 9e4bb2306f..0000000000
--- a/tests/profile/basic_keybindings.profile
+++ /dev/null
@@ -1,7 +0,0 @@
-#Version
-12.13
-
-#Keybinding
-T	T documentation	T name	T Gui-Path	true	T script
-U	U documentation	U name	U Gui-Path	false	U script
-CTRL+V	CTRL+V documentation	CTRL+V name	CTRL+V Gui-Path	false	CTRL+V script
diff --git a/tests/profile/basic_mark_nodes.profile b/tests/profile/basic_mark_nodes.profile
deleted file mode 100644
index bfd4d6be44..0000000000
--- a/tests/profile/basic_mark_nodes.profile
+++ /dev/null
@@ -1,7 +0,0 @@
-#Version
-12.13
-
-#MarkNodes
-node-1
-node-2
-node-3
diff --git a/tests/profile/basic_meta.profile b/tests/profile/basic_meta.profile
deleted file mode 100644
index af6f7b006c..0000000000
--- a/tests/profile/basic_meta.profile
+++ /dev/null
@@ -1,10 +0,0 @@
-#Version
-12.13
-
-#Meta
-Name	name
-Version	version
-Description	description
-Author	author
-URL	url
-License	license
diff --git a/tests/profile/basic_modules.profile b/tests/profile/basic_modules.profile
deleted file mode 100644
index a33b666a61..0000000000
--- a/tests/profile/basic_modules.profile
+++ /dev/null
@@ -1,7 +0,0 @@
-#Version
-12.13
-
-#Module
-abc-module		
-def-module		
-ghi-module		
diff --git a/tests/profile/basic_properties.profile b/tests/profile/basic_properties.profile
deleted file mode 100644
index 48840fd5c3..0000000000
--- a/tests/profile/basic_properties.profile
+++ /dev/null
@@ -1,10 +0,0 @@
-#Version
-12.13
-
-#Property
-setPropertyValue	property_name_1	property_value_1
-setPropertyValue	property_name_2	property_value_2
-setPropertyValue	property_name_3	property_value_3
-setPropertyValueSingle	property_name_4	property_value_5
-setPropertyValueSingle	property_name_4	property_value_5
-setPropertyValueSingle	property_name_4	property_value_5
diff --git a/tests/profile/basic_time_absolute.profile b/tests/profile/basic_time_absolute.profile
deleted file mode 100644
index aa3300facb..0000000000
--- a/tests/profile/basic_time_absolute.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Time
-absolute	2020-06-01T12:00:00
diff --git a/tests/profile/basic_time_relative.profile b/tests/profile/basic_time_relative.profile
deleted file mode 100644
index 9be50d289f..0000000000
--- a/tests/profile/basic_time_relative.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Time
-relative	-1d
diff --git a/tests/profile/basic_version_one_component.profile b/tests/profile/basic_version_one_component.profile
deleted file mode 100644
index 5f5885ce1d..0000000000
--- a/tests/profile/basic_version_one_component.profile
+++ /dev/null
@@ -1,2 +0,0 @@
-#Version
-100
diff --git a/tests/profile/basic_version_two_components.profile b/tests/profile/basic_version_two_components.profile
deleted file mode 100644
index 4b3361a6fd..0000000000
--- a/tests/profile/basic_version_two_components.profile
+++ /dev/null
@@ -1,2 +0,0 @@
-#Version
-100.200
diff --git a/tests/profile/error/camera/camera_gotogeo_altitude.profile b/tests/profile/error/camera/camera_gotogeo_altitude.profile
new file mode 100644
index 0000000000..fb4f79101b
--- /dev/null
+++ b/tests/profile/error/camera/camera_gotogeo_altitude.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "goToGeo",
+    "anchor": "anchor",
+    "latitude": 1.0,
+    "longitude": 2.0,
+    "altitude": 4.0
+  }
+}
diff --git a/tests/profile/error/camera/gotogeo_missing_anchor.profile b/tests/profile/error/camera/gotogeo_missing_anchor.profile
new file mode 100644
index 0000000000..5723ba9fb5
--- /dev/null
+++ b/tests/profile/error/camera/gotogeo_missing_anchor.profile
@@ -0,0 +1,9 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "goToGeo",
+    "latitude": 1.0,
+    "longitude": 2.0,
+    "altitude": 4.0
+  }
+}
diff --git a/tests/profile/error/camera/gotogeo_missing_latitude.profile b/tests/profile/error/camera/gotogeo_missing_latitude.profile
new file mode 100644
index 0000000000..793fdbee90
--- /dev/null
+++ b/tests/profile/error/camera/gotogeo_missing_latitude.profile
@@ -0,0 +1,9 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "goToGeo",
+    "anchor": "anchor",
+    "longitude": 2.0,
+    "altitude": 4.0
+  }
+}
diff --git a/tests/profile/error/camera/gotogeo_missing_longitude.profile b/tests/profile/error/camera/gotogeo_missing_longitude.profile
new file mode 100644
index 0000000000..e26c33cab8
--- /dev/null
+++ b/tests/profile/error/camera/gotogeo_missing_longitude.profile
@@ -0,0 +1,9 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "goToGeo",
+    "anchor": "anchor",
+    "latitude": 1.0,
+    "altitude": 4.0
+  }
+}
diff --git a/tests/profile/error/camera/gotogeo_wrongtype_altitude.profile b/tests/profile/error/camera/gotogeo_wrongtype_altitude.profile
new file mode 100644
index 0000000000..873a92b881
--- /dev/null
+++ b/tests/profile/error/camera/gotogeo_wrongtype_altitude.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "goToGeo",
+    "anchor": "anchor",
+    "latitude": 1.0,
+    "longitude": 2.0,
+    "altitude": "a"
+  }
+}
diff --git a/tests/profile/error/camera/gotogeo_wrongtype_anchor.profile b/tests/profile/error/camera/gotogeo_wrongtype_anchor.profile
new file mode 100644
index 0000000000..b95b5f41f8
--- /dev/null
+++ b/tests/profile/error/camera/gotogeo_wrongtype_anchor.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "goToGeo",
+    "anchor": 1.0,
+    "latitude": 1.0,
+    "longitude": 2.0,
+    "altitude": 4.0
+  }
+}
diff --git a/tests/profile/error/camera/gotogeo_wrongtype_latitude.profile b/tests/profile/error/camera/gotogeo_wrongtype_latitude.profile
new file mode 100644
index 0000000000..abddac66f4
--- /dev/null
+++ b/tests/profile/error/camera/gotogeo_wrongtype_latitude.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "goToGeo",
+    "anchor": "anchor",
+    "latitude": "a",
+    "longitude": 2.0,
+    "altitude": 4.0
+  }
+}
diff --git a/tests/profile/error/camera/gotogeo_wrongtype_longitude.profile b/tests/profile/error/camera/gotogeo_wrongtype_longitude.profile
new file mode 100644
index 0000000000..ae567a1fad
--- /dev/null
+++ b/tests/profile/error/camera/gotogeo_wrongtype_longitude.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "goToGeo",
+    "anchor": "anchor",
+    "latitude": 1.0,
+    "longitude": "a",
+    "altitude": 4.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_missing_anchor.profile b/tests/profile/error/camera/navstate_missing_anchor.profile
new file mode 100644
index 0000000000..4266e51886
--- /dev/null
+++ b/tests/profile/error/camera/navstate_missing_anchor.profile
@@ -0,0 +1,12 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_missing_frame.profile b/tests/profile/error/camera/navstate_missing_frame.profile
new file mode 100644
index 0000000000..056a6a3af3
--- /dev/null
+++ b/tests/profile/error/camera/navstate_missing_frame.profile
@@ -0,0 +1,12 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_missing_position.profile b/tests/profile/error/camera/navstate_missing_position.profile
new file mode 100644
index 0000000000..e8940c2b98
--- /dev/null
+++ b/tests/profile/error/camera/navstate_missing_position.profile
@@ -0,0 +1,12 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_missing_position_x.profile b/tests/profile/error/camera/navstate_missing_position_x.profile
new file mode 100644
index 0000000000..5249a7a3cd
--- /dev/null
+++ b/tests/profile/error/camera/navstate_missing_position_x.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "y": 2.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_missing_position_y.profile b/tests/profile/error/camera/navstate_missing_position_y.profile
new file mode 100644
index 0000000000..904d52db9b
--- /dev/null
+++ b/tests/profile/error/camera/navstate_missing_position_y.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_missing_position_z.profile b/tests/profile/error/camera/navstate_missing_position_z.profile
new file mode 100644
index 0000000000..b19fcafd63
--- /dev/null
+++ b/tests/profile/error/camera/navstate_missing_position_z.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_missing_up_x.profile b/tests/profile/error/camera/navstate_missing_up_x.profile
new file mode 100644
index 0000000000..f9bc0001fd
--- /dev/null
+++ b/tests/profile/error/camera/navstate_missing_up_x.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0 },
+    "up": { "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_missing_up_y.profile b/tests/profile/error/camera/navstate_missing_up_y.profile
new file mode 100644
index 0000000000..86856a2b24
--- /dev/null
+++ b/tests/profile/error/camera/navstate_missing_up_y.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0 },
+    "up": { "x": 1.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_missing_up_z.profile b/tests/profile/error/camera/navstate_missing_up_z.profile
new file mode 100644
index 0000000000..6039df61f3
--- /dev/null
+++ b/tests/profile/error/camera/navstate_missing_up_z.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0 },
+    "up": { "x": 1.0, "y": 5.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_wrongtype_aim.profile b/tests/profile/error/camera/navstate_wrongtype_aim.profile
new file mode 100644
index 0000000000..3e97edbbc7
--- /dev/null
+++ b/tests/profile/error/camera/navstate_wrongtype_aim.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": 1.0,
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_wrongtype_anchor.profile b/tests/profile/error/camera/navstate_wrongtype_anchor.profile
new file mode 100644
index 0000000000..23d0187265
--- /dev/null
+++ b/tests/profile/error/camera/navstate_wrongtype_anchor.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": 1.0,
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_wrongtype_frame.profile b/tests/profile/error/camera/navstate_wrongtype_frame.profile
new file mode 100644
index 0000000000..dfda97e71d
--- /dev/null
+++ b/tests/profile/error/camera/navstate_wrongtype_frame.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": 1.0,
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_wrongtype_pitch.profile b/tests/profile/error/camera/navstate_wrongtype_pitch.profile
new file mode 100644
index 0000000000..266f1f60dd
--- /dev/null
+++ b/tests/profile/error/camera/navstate_wrongtype_pitch.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": "a"
+  }
+}
diff --git a/tests/profile/error/camera/navstate_wrongtype_position.profile b/tests/profile/error/camera/navstate_wrongtype_position.profile
new file mode 100644
index 0000000000..1b20bacc43
--- /dev/null
+++ b/tests/profile/error/camera/navstate_wrongtype_position.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": "p",
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_wrongtype_position_x.profile b/tests/profile/error/camera/navstate_wrongtype_position_x.profile
new file mode 100644
index 0000000000..3279c86a51
--- /dev/null
+++ b/tests/profile/error/camera/navstate_wrongtype_position_x.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": "a", "y": 2.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_wrongtype_position_y.profile b/tests/profile/error/camera/navstate_wrongtype_position_y.profile
new file mode 100644
index 0000000000..378d864b2b
--- /dev/null
+++ b/tests/profile/error/camera/navstate_wrongtype_position_y.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": "a", "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_wrongtype_position_z.profile b/tests/profile/error/camera/navstate_wrongtype_position_z.profile
new file mode 100644
index 0000000000..2c6dd9a4d2
--- /dev/null
+++ b/tests/profile/error/camera/navstate_wrongtype_position_z.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": "a" },
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_wrongtype_up.profile b/tests/profile/error/camera/navstate_wrongtype_up.profile
new file mode 100644
index 0000000000..5463bce68e
--- /dev/null
+++ b/tests/profile/error/camera/navstate_wrongtype_up.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0},
+    "up": "a",
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_wrongtype_up_x.profile b/tests/profile/error/camera/navstate_wrongtype_up_x.profile
new file mode 100644
index 0000000000..4bdb253773
--- /dev/null
+++ b/tests/profile/error/camera/navstate_wrongtype_up_x.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0 },
+    "up": { "x": "a", "y": 5.0, "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_wrongtype_up_y.profile b/tests/profile/error/camera/navstate_wrongtype_up_y.profile
new file mode 100644
index 0000000000..a831c4c5e5
--- /dev/null
+++ b/tests/profile/error/camera/navstate_wrongtype_up_y.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0 },
+    "up": { "x": 4.0, "y": "a", "z": 6.0 },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_wrongtype_up_z.profile b/tests/profile/error/camera/navstate_wrongtype_up_z.profile
new file mode 100644
index 0000000000..95058601f5
--- /dev/null
+++ b/tests/profile/error/camera/navstate_wrongtype_up_z.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0 },
+    "up": { "x": 4.0, "y": 5.0, "z": "a" },
+    "yaw": 10.0,
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/navstate_wrongtype_yaw.profile b/tests/profile/error/camera/navstate_wrongtype_yaw.profile
new file mode 100644
index 0000000000..556f0f24a8
--- /dev/null
+++ b/tests/profile/error/camera/navstate_wrongtype_yaw.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "setNavigationState",
+    "anchor": "none",
+    "aim": "aim",
+    "frame": "root",
+    "position": { "x": 1.0, "y": 2.0, "z": 3.0},
+    "up": { "x": 4.0, "y": 5.0, "z": 6.0 },
+    "yaw": "a",
+    "pitch": -10.0
+  }
+}
diff --git a/tests/profile/error/camera/wrongvalue_type.profile b/tests/profile/error/camera/wrongvalue_type.profile
new file mode 100644
index 0000000000..383a761e8a
--- /dev/null
+++ b/tests/profile/error/camera/wrongvalue_type.profile
@@ -0,0 +1,6 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "camera": {
+    "type": "ABC"
+  }
+}
diff --git a/tests/profile/error/deltatimes/wrongtype_value.profile b/tests/profile/error/deltatimes/wrongtype_value.profile
new file mode 100644
index 0000000000..6337079019
--- /dev/null
+++ b/tests/profile/error/deltatimes/wrongtype_value.profile
@@ -0,0 +1,6 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "delta_times": [
+    1, 10, "notANumber", 200
+  ]
+}
diff --git a/tests/profile/error/keybinding/missing_documentation.profile b/tests/profile/error/keybinding/missing_documentation.profile
new file mode 100644
index 0000000000..7bc644105f
--- /dev/null
+++ b/tests/profile/error/keybinding/missing_documentation.profile
@@ -0,0 +1,12 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "T",
+      "name": "T name",
+      "gui_path": "T Gui-Path",
+      "is_local": true,
+      "script": "T script"
+    }
+  ]
+}
diff --git a/tests/profile/error/keybinding/missing_guipath.profile b/tests/profile/error/keybinding/missing_guipath.profile
new file mode 100644
index 0000000000..c325eb6f39
--- /dev/null
+++ b/tests/profile/error/keybinding/missing_guipath.profile
@@ -0,0 +1,12 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "T",
+      "documentation": "T documentation",
+      "name": "T name",
+      "is_local": true,
+      "script": "T script"
+    }
+  ]
+}
diff --git a/tests/profile/error/keybinding/missing_islocal.profile b/tests/profile/error/keybinding/missing_islocal.profile
new file mode 100644
index 0000000000..a014d38ddd
--- /dev/null
+++ b/tests/profile/error/keybinding/missing_islocal.profile
@@ -0,0 +1,12 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "T",
+      "documentation": "T documentation",
+      "name": "T name",
+      "gui_path": "T Gui-Path",
+      "script": "T script"
+    }
+  ]
+}
diff --git a/tests/profile/error/keybinding/missing_key.profile b/tests/profile/error/keybinding/missing_key.profile
new file mode 100644
index 0000000000..9d145e40a4
--- /dev/null
+++ b/tests/profile/error/keybinding/missing_key.profile
@@ -0,0 +1,12 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "documentation": "T documentation",
+      "name": "T name",
+      "gui_path": "T Gui-Path",
+      "is_local": true,
+      "script": "T script"
+    }
+  ]
+}
diff --git a/tests/profile/error/keybinding/missing_name.profile b/tests/profile/error/keybinding/missing_name.profile
new file mode 100644
index 0000000000..9721ff025f
--- /dev/null
+++ b/tests/profile/error/keybinding/missing_name.profile
@@ -0,0 +1,12 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "T",
+      "documentation": "T documentation",
+      "gui_path": "T Gui-Path",
+      "is_local": true,
+      "script": "T script"
+    }
+  ]
+}
diff --git a/tests/profile/error/keybinding/missing_script - Copy.profile b/tests/profile/error/keybinding/missing_script - Copy.profile
new file mode 100644
index 0000000000..8de5d6cf57
--- /dev/null
+++ b/tests/profile/error/keybinding/missing_script - Copy.profile	
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "T",
+      "documentation": "T documentation",
+      "name": "T name",
+      "gui_path": "T Gui-Path",
+      "is_local": true,
+      "script": "T script"
+    }
+  ]
+}
diff --git a/tests/profile/error/keybinding/missing_script.profile b/tests/profile/error/keybinding/missing_script.profile
new file mode 100644
index 0000000000..4e6194af2b
--- /dev/null
+++ b/tests/profile/error/keybinding/missing_script.profile
@@ -0,0 +1,12 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "T",
+      "documentation": "T documentation",
+      "name": "T name",
+      "gui_path": "T Gui-Path",
+      "is_local": true
+    }
+  ]
+}
diff --git a/tests/profile/error/keybinding/wrongtype_documentation.profile b/tests/profile/error/keybinding/wrongtype_documentation.profile
new file mode 100644
index 0000000000..86a3f652bc
--- /dev/null
+++ b/tests/profile/error/keybinding/wrongtype_documentation.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "T",
+      "documentation": 1.0,
+      "name": "T name",
+      "gui_path": "T Gui-Path",
+      "is_local": true,
+      "script": "T script"
+    }
+  ]
+}
diff --git a/tests/profile/error/keybinding/wrongtype_guipath.profile b/tests/profile/error/keybinding/wrongtype_guipath.profile
new file mode 100644
index 0000000000..60ad9cb2a7
--- /dev/null
+++ b/tests/profile/error/keybinding/wrongtype_guipath.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "T",
+      "documentation": "T documentation",
+      "name": "T name",
+      "gui_path": 1.0,
+      "is_local": true,
+      "script": "T script"
+    }
+  ]
+}
diff --git a/tests/profile/error/keybinding/wrongtype_islocal.profile b/tests/profile/error/keybinding/wrongtype_islocal.profile
new file mode 100644
index 0000000000..75b6dea631
--- /dev/null
+++ b/tests/profile/error/keybinding/wrongtype_islocal.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "T",
+      "documentation": "T documentation",
+      "name": "T name",
+      "gui_path": "T Gui-Path",
+      "is_local": "ER",
+      "script": "T script"
+    }
+  ]
+}
diff --git a/tests/profile/error/keybinding/wrongtype_name.profile b/tests/profile/error/keybinding/wrongtype_name.profile
new file mode 100644
index 0000000000..802dbc13a0
--- /dev/null
+++ b/tests/profile/error/keybinding/wrongtype_name.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "T",
+      "documentation": "T documentation",
+      "name": 1.0,
+      "gui_path": "T Gui-Path",
+      "is_local": true,
+      "script": "T script"
+    }
+  ]
+}
diff --git a/tests/profile/error/keybinding/wrongtype_script.profile b/tests/profile/error/keybinding/wrongtype_script.profile
new file mode 100644
index 0000000000..264e2f89f1
--- /dev/null
+++ b/tests/profile/error/keybinding/wrongtype_script.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "T",
+      "documentation": "T documentation",
+      "name": "T name",
+      "gui_path": "T Gui-Path",
+      "is_local": true,
+      "script": 1.0
+    }
+  ]
+}
diff --git a/tests/profile/error/keybinding/wrongvalue_key.profile b/tests/profile/error/keybinding/wrongvalue_key.profile
new file mode 100644
index 0000000000..111d034ce0
--- /dev/null
+++ b/tests/profile/error/keybinding/wrongvalue_key.profile
@@ -0,0 +1,13 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "F50",
+      "documentation": "T documentation",
+      "name": "T name",
+      "gui_path": "T Gui-Path",
+      "is_local": true,
+      "script": "T script"
+    }
+  ]
+}
diff --git a/tests/profile/error/keybinding/wrongvalue_modifier.profile b/tests/profile/error/keybinding/wrongvalue_modifier.profile
new file mode 100644
index 0000000000..86816e5582
--- /dev/null
+++ b/tests/profile/error/keybinding/wrongvalue_modifier.profile
@@ -0,0 +1,29 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "keybindings": [
+    {
+      "key": "Keykey+F",
+      "documentation": "T documentation",
+      "name": "T name",
+      "gui_path": "T Gui-Path",
+      "is_local": true,
+      "script": "T script"
+    },
+    {
+      "key": "U",
+      "documentation": "U documentation",
+      "name": "U name",
+      "gui_path": "U Gui-Path",
+      "is_local": false,
+      "script": "U script"
+    },
+    {
+      "key": "CTRL+V",
+      "documentation": "CTRL+V documentation",
+      "name": "CTRL+V name",
+      "gui_path": "UCTRL+V Gui-Path",
+      "is_local": false,
+      "script": "CTRL+V script"
+    }
+  ]
+}
diff --git a/tests/profile/error/meta/wrong_parameter_value_type.profile b/tests/profile/error/meta/wrong_parameter_value_type.profile
new file mode 100644
index 0000000000..5a76e4856b
--- /dev/null
+++ b/tests/profile/error/meta/wrong_parameter_value_type.profile
@@ -0,0 +1,6 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "meta": {
+    "unknown-type": "name"
+  }
+}
diff --git a/tests/profile/error/module/missing_name.profile b/tests/profile/error/module/missing_name.profile
new file mode 100644
index 0000000000..ee9e15dbd1
--- /dev/null
+++ b/tests/profile/error/module/missing_name.profile
@@ -0,0 +1,8 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "modules": [
+    {
+      "loadedInstruction": "instr"
+    }
+  ]
+}
diff --git a/tests/profile/error/module/wrongtype_loadedInstruction.profile b/tests/profile/error/module/wrongtype_loadedInstruction.profile
new file mode 100644
index 0000000000..487da301e8
--- /dev/null
+++ b/tests/profile/error/module/wrongtype_loadedInstruction.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "modules": [
+    {
+      "name": "jkl-module",
+      "loadedInstruction": 1.0,
+      "notLoadedInstruction": "not_instr"
+    }
+  ]
+}
diff --git a/tests/profile/error/module/wrongtype_name.profile b/tests/profile/error/module/wrongtype_name.profile
new file mode 100644
index 0000000000..41f31cc96e
--- /dev/null
+++ b/tests/profile/error/module/wrongtype_name.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "modules": [
+    {
+      "name": 1.0,
+      "loadedInstruction": "instr",
+      "notLoadedInstruction": "not_instr"
+    }
+  ]
+}
diff --git a/tests/profile/error/module/wrongtype_notLoadedInstruction.profile b/tests/profile/error/module/wrongtype_notLoadedInstruction.profile
new file mode 100644
index 0000000000..3bb5b741b6
--- /dev/null
+++ b/tests/profile/error/module/wrongtype_notLoadedInstruction.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "modules": [
+    {
+      "name": "jkl-module",
+      "loadedInstruction": "instr",
+      "notLoadedInstruction": 1.0
+    }
+  ]
+}
diff --git a/tests/profile/error/property/missing_name.profile b/tests/profile/error/property/missing_name.profile
new file mode 100644
index 0000000000..244f7d3d46
--- /dev/null
+++ b/tests/profile/error/property/missing_name.profile
@@ -0,0 +1,9 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "properties": [
+    {
+      "type": "setPropertyValue",
+      "value": "v"
+    }
+  ]
+}
diff --git a/tests/profile/error/property/missing_name_value.profile b/tests/profile/error/property/missing_name_value.profile
new file mode 100644
index 0000000000..4c380573f1
--- /dev/null
+++ b/tests/profile/error/property/missing_name_value.profile
@@ -0,0 +1,8 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "properties": [
+    {
+      "type": "setPropertyValue"
+    }
+  ]
+}
diff --git a/tests/profile/error/property/missing_value.profile b/tests/profile/error/property/missing_value.profile
new file mode 100644
index 0000000000..b1bafbb9fa
--- /dev/null
+++ b/tests/profile/error/property/missing_value.profile
@@ -0,0 +1,9 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "properties": [
+    {
+      "type": "setPropertyValue",
+      "name": "n"
+    }
+  ]
+}
diff --git a/tests/profile/error/property/wrongtype_name.profile b/tests/profile/error/property/wrongtype_name.profile
new file mode 100644
index 0000000000..c4f74acd48
--- /dev/null
+++ b/tests/profile/error/property/wrongtype_name.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "properties": [
+    {
+      "type": "setPropertyValue",
+      "name": 1.0,
+      "value": "property_value_1"
+    }
+  ]
+}
diff --git a/tests/profile/error/property/wrongtype_value.profile b/tests/profile/error/property/wrongtype_value.profile
new file mode 100644
index 0000000000..481595b88d
--- /dev/null
+++ b/tests/profile/error/property/wrongtype_value.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "properties": [
+    {
+      "type": "setPropertyValue",
+      "name": "property_name_1",
+      "value": 1.0
+    }
+  ]
+}
diff --git a/tests/profile/error/property/wrongvalue_type.profile b/tests/profile/error/property/wrongvalue_type.profile
new file mode 100644
index 0000000000..8079c6f83b
--- /dev/null
+++ b/tests/profile/error/property/wrongvalue_type.profile
@@ -0,0 +1,10 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "properties": [
+    {
+      "type": "unknown-set-property-command",
+      "name": "property_name_1",
+      "value": "property_value_1"
+    }
+  ]
+}
diff --git a/tests/profile/error/time/absolute_missing_value.profile b/tests/profile/error/time/absolute_missing_value.profile
new file mode 100644
index 0000000000..01bc8537f0
--- /dev/null
+++ b/tests/profile/error/time/absolute_missing_value.profile
@@ -0,0 +1,6 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "time": {
+    "type": "absolute"
+  }
+}
diff --git a/tests/profile/error/time/missing_type.profile b/tests/profile/error/time/missing_type.profile
new file mode 100644
index 0000000000..599331efdf
--- /dev/null
+++ b/tests/profile/error/time/missing_type.profile
@@ -0,0 +1,5 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "time": {
+  }
+}
diff --git a/tests/profile/error/time/relative_missing_value.profile b/tests/profile/error/time/relative_missing_value.profile
new file mode 100644
index 0000000000..f7cd7b9a04
--- /dev/null
+++ b/tests/profile/error/time/relative_missing_value.profile
@@ -0,0 +1,6 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "time": {
+    "type": "relative"
+  }
+}
diff --git a/tests/profile/error/time/too_few_parameters.profile b/tests/profile/error/time/too_few_parameters.profile
new file mode 100644
index 0000000000..01bc8537f0
--- /dev/null
+++ b/tests/profile/error/time/too_few_parameters.profile
@@ -0,0 +1,6 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "time": {
+    "type": "absolute"
+  }
+}
diff --git a/tests/profile/error/time/wrongvalue_type.profile b/tests/profile/error/time/wrongvalue_type.profile
new file mode 100644
index 0000000000..44c81fd852
--- /dev/null
+++ b/tests/profile/error/time/wrongvalue_type.profile
@@ -0,0 +1,7 @@
+{
+  "version": { "major": 12, "minor": 13 },
+  "time": {
+    "type": "ER",
+    "value": "2020-06-01T12:00:00"
+  }
+}
diff --git a/tests/profile/error/version/missing_major.profile b/tests/profile/error/version/missing_major.profile
new file mode 100644
index 0000000000..a58011b567
--- /dev/null
+++ b/tests/profile/error/version/missing_major.profile
@@ -0,0 +1,3 @@
+{
+  "version": { "minor": 13 }
+}
diff --git a/tests/profile/error/version/missing_minor.profile b/tests/profile/error/version/missing_minor.profile
new file mode 100644
index 0000000000..a9cda0afe6
--- /dev/null
+++ b/tests/profile/error/version/missing_minor.profile
@@ -0,0 +1,3 @@
+{
+  "version": { "major": 13 }
+}
diff --git a/tests/profile/error/version/wrongtype_major.profile b/tests/profile/error/version/wrongtype_major.profile
new file mode 100644
index 0000000000..21987def77
--- /dev/null
+++ b/tests/profile/error/version/wrongtype_major.profile
@@ -0,0 +1,3 @@
+{
+  "version": { "major": "abc", "minor": 0.0 }
+}
diff --git a/tests/profile/error/version/wrongtype_major_minor.profile b/tests/profile/error/version/wrongtype_major_minor.profile
new file mode 100644
index 0000000000..8ec21c63fe
--- /dev/null
+++ b/tests/profile/error/version/wrongtype_major_minor.profile
@@ -0,0 +1,3 @@
+{
+  "version": { "major": "abc", "minor": "xyz" }
+}
diff --git a/tests/profile/error/version/wrongtype_minor.profile b/tests/profile/error/version/wrongtype_minor.profile
new file mode 100644
index 0000000000..5dce3aa6e8
--- /dev/null
+++ b/tests/profile/error/version/wrongtype_minor.profile
@@ -0,0 +1,3 @@
+{
+  "version": { "major": 1.0, "minor": "xyz" }
+}
diff --git a/tests/profile/error_asset_too_few_parameters.profile b/tests/profile/error_asset_too_few_parameters.profile
deleted file mode 100644
index 729887604e..0000000000
--- a/tests/profile/error_asset_too_few_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Asset
-folder1/folder2/asset
diff --git a/tests/profile/error_asset_too_many_parameters.profile b/tests/profile/error_asset_too_many_parameters.profile
deleted file mode 100644
index 4783325378..0000000000
--- a/tests/profile/error_asset_too_many_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Asset
-folder1/folder2/asset	A	B
diff --git a/tests/profile/error_camera_gotogeo_too_few_parameters.profile b/tests/profile/error_camera_gotogeo_too_few_parameters.profile
deleted file mode 100644
index 4fcbbe9f1d..0000000000
--- a/tests/profile/error_camera_gotogeo_too_few_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-goToGeo
diff --git a/tests/profile/error_camera_gotogeo_too_many_parameters.profile b/tests/profile/error_camera_gotogeo_too_many_parameters.profile
deleted file mode 100644
index 1d968ac8b6..0000000000
--- a/tests/profile/error_camera_gotogeo_too_many_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-goToGeo	A	B	C	D	E
diff --git a/tests/profile/error_camera_navstate_too_few_parameters.profile b/tests/profile/error_camera_navstate_too_few_parameters.profile
deleted file mode 100644
index 4706283410..0000000000
--- a/tests/profile/error_camera_navstate_too_few_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-setNavigationState
diff --git a/tests/profile/error_camera_navstate_too_many_parameters.profile b/tests/profile/error_camera_navstate_too_many_parameters.profile
deleted file mode 100644
index 7b79d8f5b5..0000000000
--- a/tests/profile/error_camera_navstate_too_many_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-setNavigationState	A	B	C	D	E	F	G	
diff --git a/tests/profile/error_camera_navstate_wrong_parameter_too_few_components_position.profile b/tests/profile/error_camera_navstate_wrong_parameter_too_few_components_position.profile
deleted file mode 100644
index 99329e8575..0000000000
--- a/tests/profile/error_camera_navstate_wrong_parameter_too_few_components_position.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-setNavigationState	"node"		"root"	1.0, 2.0	4.0, 5.0, 6.0		
diff --git a/tests/profile/error_camera_navstate_wrong_parameter_too_few_components_up.profile b/tests/profile/error_camera_navstate_wrong_parameter_too_few_components_up.profile
deleted file mode 100644
index 474b470b0c..0000000000
--- a/tests/profile/error_camera_navstate_wrong_parameter_too_few_components_up.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-setNavigationState	"node"		"root"	1.0, 2.0, 3.0	4.0, 5.0		
diff --git a/tests/profile/error_camera_navstate_wrong_parameter_too_many_components_position.profile b/tests/profile/error_camera_navstate_wrong_parameter_too_many_components_position.profile
deleted file mode 100644
index 4f5e4a1832..0000000000
--- a/tests/profile/error_camera_navstate_wrong_parameter_too_many_components_position.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-setNavigationState	"node"		"root"	1.0, 2.0, 3.0, 4.0	4.0, 5.0, 6.0		
diff --git a/tests/profile/error_camera_navstate_wrong_parameter_type_pitch.profile b/tests/profile/error_camera_navstate_wrong_parameter_type_pitch.profile
deleted file mode 100644
index 2d11012aec..0000000000
--- a/tests/profile/error_camera_navstate_wrong_parameter_type_pitch.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-setNavigationState	"node"		"root"	1.0, 2.0, 3.0	4.0, 5.0, 6.0		def
diff --git a/tests/profile/error_camera_navstate_wrong_parameter_type_yaw.profile b/tests/profile/error_camera_navstate_wrong_parameter_type_yaw.profile
deleted file mode 100644
index 9ab1683ecb..0000000000
--- a/tests/profile/error_camera_navstate_wrong_parameter_type_yaw.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-setNavigationState	"node"		"root"	1.0, 2.0, 3.0	4.0, 5.0, 6.0	abc	
diff --git a/tests/profile/error_camera_navstate_wrong_parameter_wrong_component_type_position.profile b/tests/profile/error_camera_navstate_wrong_parameter_wrong_component_type_position.profile
deleted file mode 100644
index 37b3549a63..0000000000
--- a/tests/profile/error_camera_navstate_wrong_parameter_wrong_component_type_position.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-setNavigationState	"node"		"root"	1.0, 2.0, abc	4.0, 5.0, 6.0		
diff --git a/tests/profile/error_camera_navstate_wrong_parameter_wrong_component_type_up.profile b/tests/profile/error_camera_navstate_wrong_parameter_wrong_component_type_up.profile
deleted file mode 100644
index b525fd97bb..0000000000
--- a/tests/profile/error_camera_navstate_wrong_parameter_wrong_component_type_up.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-setNavigationState	"node"		"root"	1.0, 2.0, 3.0	4.0, abc, 6.0		
diff --git a/tests/profile/error_camera_wrong_parameter_value_type.profile b/tests/profile/error_camera_wrong_parameter_value_type.profile
deleted file mode 100644
index cacb736f72..0000000000
--- a/tests/profile/error_camera_wrong_parameter_value_type.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Camera
-ER
diff --git a/tests/profile/error_deltatimes_wrong_parameter_value_type.profile b/tests/profile/error_deltatimes_wrong_parameter_value_type.profile
deleted file mode 100644
index 77fafee19c..0000000000
--- a/tests/profile/error_deltatimes_wrong_parameter_value_type.profile
+++ /dev/null
@@ -1,8 +0,0 @@
-#Version
-12.13
-
-#DeltaTimes
-1
-10
-notANumber
-200
diff --git a/tests/profile/error_keybinding_too_few_parameters.profile b/tests/profile/error_keybinding_too_few_parameters.profile
deleted file mode 100644
index b80118e4a1..0000000000
--- a/tests/profile/error_keybinding_too_few_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Keybinding
-T
diff --git a/tests/profile/error_keybinding_too_many_parameters.profile b/tests/profile/error_keybinding_too_many_parameters.profile
deleted file mode 100644
index 1a539a8368..0000000000
--- a/tests/profile/error_keybinding_too_many_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Keybinding
-A	B	C	D	E	F	
diff --git a/tests/profile/error_keybinding_wrong_parameter_type_local.profile b/tests/profile/error_keybinding_wrong_parameter_type_local.profile
deleted file mode 100644
index dd6c29b377..0000000000
--- a/tests/profile/error_keybinding_wrong_parameter_type_local.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Keybinding
-T	T documentation	T name	T Gui-Path	ER	T script
diff --git a/tests/profile/error_keybinding_wrong_parameter_value_key.profile b/tests/profile/error_keybinding_wrong_parameter_value_key.profile
deleted file mode 100644
index a34dd5dfb0..0000000000
--- a/tests/profile/error_keybinding_wrong_parameter_value_key.profile
+++ /dev/null
@@ -1,7 +0,0 @@
-#Version
-12.13
-
-#Keybinding
-F50	T documentation	T name	T Gui-Path	true	T script
-U	U documentation	U name	U Gui-Path	false	U script
-CTRL+V	CTRL+V documentation	CTRL+V name	CTRL+V Gui-Path	false	CTRL+V script
diff --git a/tests/profile/error_keybinding_wrong_parameter_value_modifier.profile b/tests/profile/error_keybinding_wrong_parameter_value_modifier.profile
deleted file mode 100644
index ae9f781640..0000000000
--- a/tests/profile/error_keybinding_wrong_parameter_value_modifier.profile
+++ /dev/null
@@ -1,7 +0,0 @@
-#Version
-12.13
-
-#Keybinding
-Keykey+F	T documentation	T name	T Gui-Path	true	T script
-U	U documentation	U name	U Gui-Path	false	U script
-CTRL+V	CTRL+V documentation	CTRL+V name	CTRL+V Gui-Path	false	CTRL+V script
diff --git a/tests/profile/error_meta_wrong_parameter_value_type.profile b/tests/profile/error_meta_wrong_parameter_value_type.profile
deleted file mode 100644
index eabaf0e13b..0000000000
--- a/tests/profile/error_meta_wrong_parameter_value_type.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Meta
-Unknown-Type	name
diff --git a/tests/profile/error_missing_separator_line.profile b/tests/profile/error_missing_separator_line.profile
deleted file mode 100644
index 244ed08392..0000000000
--- a/tests/profile/error_missing_separator_line.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-#Version
-12.13
-#Asset
-asset	require	
\ No newline at end of file
diff --git a/tests/profile/error_module_too_few_parameters.profile b/tests/profile/error_module_too_few_parameters.profile
deleted file mode 100644
index b30bacc2a7..0000000000
--- a/tests/profile/error_module_too_few_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Module
-abc-module
diff --git a/tests/profile/error_module_too_many_parameters.profile b/tests/profile/error_module_too_many_parameters.profile
deleted file mode 100644
index c4735b9847..0000000000
--- a/tests/profile/error_module_too_many_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Module
-abc-module			
diff --git a/tests/profile/error_property_too_few_parameters.profile b/tests/profile/error_property_too_few_parameters.profile
deleted file mode 100644
index d25c53a869..0000000000
--- a/tests/profile/error_property_too_few_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Property
-setPropertyValue
diff --git a/tests/profile/error_property_too_many_parameters.profile b/tests/profile/error_property_too_many_parameters.profile
deleted file mode 100644
index b1c0baf3fc..0000000000
--- a/tests/profile/error_property_too_many_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Property
-setPropertyValue	property_name_1	property_value_1	
diff --git a/tests/profile/error_property_wrong_parameter_value_type.profile b/tests/profile/error_property_wrong_parameter_value_type.profile
deleted file mode 100644
index b5471500e9..0000000000
--- a/tests/profile/error_property_wrong_parameter_value_type.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Property
-unknown-set-property-command	property_name_1	property_value_1
diff --git a/tests/profile/error_time_too_few_parameters.profile b/tests/profile/error_time_too_few_parameters.profile
deleted file mode 100644
index 3683be625d..0000000000
--- a/tests/profile/error_time_too_few_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Time
-absolute
diff --git a/tests/profile/error_time_too_many_parameters.profile b/tests/profile/error_time_too_many_parameters.profile
deleted file mode 100644
index 3b6e14aaff..0000000000
--- a/tests/profile/error_time_too_many_parameters.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Time
-absolute	2020-06-01T12:00:00	
diff --git a/tests/profile/error_time_wrong_parameter_value_type.profile b/tests/profile/error_time_wrong_parameter_value_type.profile
deleted file mode 100644
index f6f071b0b3..0000000000
--- a/tests/profile/error_time_wrong_parameter_value_type.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Time
-ER	2020-06-01T12:00:00
diff --git a/tests/profile/error_two_camera_sections.profile b/tests/profile/error_two_camera_sections.profile
deleted file mode 100644
index 42088995e6..0000000000
--- a/tests/profile/error_two_camera_sections.profile
+++ /dev/null
@@ -1,8 +0,0 @@
-#Version
-12.13
-
-#Camera
-setNavigationState	"node"		"root"	1.0, 2.0, 3.0	4.0, 5.0, 6.0		
-
-#Camera
-setNavigationState	"node"		"root"	1.0, 2.0, 3.0	4.0, 5.0, 6.0		
diff --git a/tests/profile/error_two_meta_sections.profile b/tests/profile/error_two_meta_sections.profile
deleted file mode 100644
index ae6a8081f4..0000000000
--- a/tests/profile/error_two_meta_sections.profile
+++ /dev/null
@@ -1,18 +0,0 @@
-#Version
-12.13
-
-#Meta
-Name	name
-Version	version
-Description	description
-Author	author
-URL	url
-License	license
-
-#Meta
-Name	name
-Version	version
-Description	description
-Author	author
-URL	url
-License	license
diff --git a/tests/profile/error_two_time_sections.profile b/tests/profile/error_two_time_sections.profile
deleted file mode 100644
index 5d41296d14..0000000000
--- a/tests/profile/error_two_time_sections.profile
+++ /dev/null
@@ -1,8 +0,0 @@
-#Version
-12.13
-
-#Time
-relative	-1d
-
-#Time
-relative	-1d
diff --git a/tests/profile/error_two_version_sections.profile b/tests/profile/error_two_version_sections.profile
deleted file mode 100644
index ae59d5f695..0000000000
--- a/tests/profile/error_two_version_sections.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#Version
-12.13
-
-#Version
-22.23
diff --git a/tests/profile/error_unrecognized_header.profile b/tests/profile/error_unrecognized_header.profile
deleted file mode 100644
index f9cafb2996..0000000000
--- a/tests/profile/error_unrecognized_header.profile
+++ /dev/null
@@ -1,7 +0,0 @@
-#Version
-12.13
-
-#Azzet
-folder1/folder2/asset	require	
-folder3/folder4/asset2	require	variable
-folder5/folder6/asset3	request	
diff --git a/tests/profile/error_version_malformed_component.profile b/tests/profile/error_version_malformed_component.profile
deleted file mode 100644
index 96d4c99ce8..0000000000
--- a/tests/profile/error_version_malformed_component.profile
+++ /dev/null
@@ -1,2 +0,0 @@
-#Version
-abcxyz
diff --git a/tests/profile/error_version_not_first.profile b/tests/profile/error_version_not_first.profile
deleted file mode 100644
index ec65de1fba..0000000000
--- a/tests/profile/error_version_not_first.profile
+++ /dev/null
@@ -1,7 +0,0 @@
-#Asset
-folder1/folder2/asset	require	
-folder3/folder4/asset2	require	variable
-folder5/folder6/asset3	request	
-
-#Version
-12.13
diff --git a/tests/profile/error_version_too_many_components.profile b/tests/profile/error_version_too_many_components.profile
deleted file mode 100644
index 91848a5a2e..0000000000
--- a/tests/profile/error_version_too_many_components.profile
+++ /dev/null
@@ -1,2 +0,0 @@
-#Version
-1.0.0
diff --git a/tests/profile/integration/full_test.profile b/tests/profile/integration/full_test.profile
new file mode 100644
index 0000000000..6634282e65
--- /dev/null
+++ b/tests/profile/integration/full_test.profile
@@ -0,0 +1,116 @@
+{
+  "version": { "major": 22, "minor": 21 },
+  "meta": {
+    "name": "name",
+    "version": "version",
+    "description": "description",
+    "author": "author",
+    "url": "url",
+    "license": "license"
+  },
+  "modules": [
+    { "name": "abs-module" },
+    {
+      "name": "def-module",
+      "loadedInstruction": "instr"
+    },
+    {
+      "name": "ghi-module",
+      "notLoadedInstruction": "not_instr"
+    },
+    {
+      "name": "jkl-module",
+      "loadedInstruction": "instr",
+      "notLoadedInstruction": "not_instr"
+    }
+  ],
+  "assets": [
+    "scene/solarsystem/planets/earth/earth",
+    "scene/solarsystem/planets/earth/satellites/satellites",
+    "folder1/folder2/asset",
+    "folder3/folder4/asset2",
+    "folder5/folder6/asset3"
+  ],
+  "properties": [
+    {
+      "type": "setPropertyValue",
+      "name": "{earth_satellites}.Renderable.Enabled",
+      "value": "false"
+    },
+    {
+      "type": "setPropertyValue",
+      "name": "property_name_1",
+      "value": "property_value_1"
+    },
+    {
+      "type": "setPropertyValue",
+      "name": "property_name_2",
+      "value": "property_value_2"
+    },
+    {
+      "type": "setPropertyValue",
+      "name": "property_name_3",
+      "value": "property_value_3"
+    },
+    {
+      "type": "setPropertyValueSingle",
+      "name": "property_name_4",
+      "value": "property_value_4"
+    },
+    {
+      "type": "setPropertyValueSingle",
+      "name": "property_name_5",
+      "value": "property_value_5"
+    },
+    {
+      "type": "setPropertyValueSingle",
+      "name": "property_name_6",
+      "value": "property_value_6"
+    }
+  ],
+  "keybindings": [
+    {
+      "key": "T",
+      "documentation": "T documentation",
+      "name": "T name",
+      "gui_path": "T Gui-Path",
+      "is_local": true,
+      "script": "T script"
+    },
+    {
+      "key": "U",
+      "documentation": "U documentation",
+      "name": "U name",
+      "gui_path": "U Gui-Path",
+      "is_local": false,
+      "script": "U script"
+    },
+    {
+      "key": "CTRL+V",
+      "documentation": "CTRL+V documentation",
+      "name": "CTRL+V name",
+      "gui_path": "CTRL+V Gui-Path",
+      "is_local": false,
+      "script": "CTRL+V script"
+    }
+  ],
+  "time": {
+    "type": "relative",
+    "value": "-1d"
+  },
+  "camera": {
+    "type": "goToGeo",
+    "anchor": "Earth",
+    "latitude": 58.5877,
+    "longitude": 16.1924,
+    "altitude": 2.0e+07
+  },
+  "mark_nodes": [
+    "Earth", "Mars", "Moon", "Sun"
+  ],
+  "additional_scripts": [
+    "script-1",
+    "script-2",
+    "script-3"
+  ]
+}
diff --git a/tests/profile/integration_full_test.profile b/tests/profile/integration_full_test.profile
deleted file mode 100644
index 7277f3fb2f..0000000000
--- a/tests/profile/integration_full_test.profile
+++ /dev/null
@@ -1,53 +0,0 @@
-#Version
-22.21
-
-#Meta
-Name	name
-Version	version
-Description	description
-Author	author
-URL	url
-License	license
-
-#Module
-abc-module		
-def-module		
-ghi-module		
-
-#Asset
-scene/solarsystem/planets/earth/earth	
-scene/solarsystem/planets/earth/satellites/satellites	
-folder1/folder2/asset	
-folder3/folder4/asset2	variable
-folder5/folder6/asset3	
-
-#Property
-setPropertyValue	{earth_satellites}.Renderable.Enabled	false
-setPropertyValue	property_name_1	property_value_1
-setPropertyValue	property_name_2	property_value_2
-setPropertyValue	property_name_3	property_value_3
-setPropertyValueSingle	property_name_4	property_value_5
-setPropertyValueSingle	property_name_4	property_value_5
-setPropertyValueSingle	property_name_4	property_value_5
-
-#Keybinding
-T	T documentation	T name	T Gui-Path	true	T script
-U	U documentation	U name	U Gui-Path	false	U script
-CTRL+V	CTRL+V documentation	CTRL+V name	CTRL+V Gui-Path	false	CTRL+V script
-
-#Time
-relative	-1d
-
-#Camera
-goToGeo	"Earth"	58.5877	16.1924	2.0e+07
-
-#MarkNodes
-Earth
-Mars
-Moon
-Sun
-
-#AdditionalScripts
-script-1
-script-2
-script-3
diff --git a/tests/profile/integration_full_test_permutation_1.profile b/tests/profile/integration_full_test_permutation_1.profile
deleted file mode 100644
index 8ae178f64a..0000000000
--- a/tests/profile/integration_full_test_permutation_1.profile
+++ /dev/null
@@ -1,54 +0,0 @@
-#Version
-22.21
-
-#MarkNodes
-Earth
-Mars
-Moon
-Sun
-
-#Time
-relative	-1d
-
-#Camera
-goToGeo	"Earth"	58.5877	16.1924	2.0e+07
-
-#Property
-setPropertyValue	{earth_satellites}.Renderable.Enabled	false
-setPropertyValue	property_name_1	property_value_1
-setPropertyValue	property_name_2	property_value_2
-setPropertyValue	property_name_3	property_value_3
-setPropertyValueSingle	property_name_4	property_value_5
-setPropertyValueSingle	property_name_4	property_value_5
-setPropertyValueSingle	property_name_4	property_value_5
-
-#AdditionalScripts
-script-1
-script-2
-script-3
-
-#Asset
-scene/solarsystem/planets/earth/earth	
-scene/solarsystem/planets/earth/satellites/satellites	
-folder1/folder2/asset	
-folder3/folder4/asset2	variable
-folder5/folder6/asset3	
-
-#Meta
-Name	name
-Version	version
-Description	description
-Author	author
-URL	url
-License	license
-
-#Keybinding
-T	T documentation	T name	T Gui-Path	true	T script
-U	U documentation	U name	U Gui-Path	false	U script
-CTRL+V	CTRL+V documentation	CTRL+V name	CTRL+V Gui-Path	false	CTRL+V script
-
-#Module
-abc-module		
-def-module		
-ghi-module		
-
diff --git a/tests/profile/integration_full_test_permutation_base.profile b/tests/profile/integration_full_test_permutation_base.profile
deleted file mode 100644
index 7277f3fb2f..0000000000
--- a/tests/profile/integration_full_test_permutation_base.profile
+++ /dev/null
@@ -1,53 +0,0 @@
-#Version
-22.21
-
-#Meta
-Name	name
-Version	version
-Description	description
-Author	author
-URL	url
-License	license
-
-#Module
-abc-module		
-def-module		
-ghi-module		
-
-#Asset
-scene/solarsystem/planets/earth/earth	
-scene/solarsystem/planets/earth/satellites/satellites	
-folder1/folder2/asset	
-folder3/folder4/asset2	variable
-folder5/folder6/asset3	
-
-#Property
-setPropertyValue	{earth_satellites}.Renderable.Enabled	false
-setPropertyValue	property_name_1	property_value_1
-setPropertyValue	property_name_2	property_value_2
-setPropertyValue	property_name_3	property_value_3
-setPropertyValueSingle	property_name_4	property_value_5
-setPropertyValueSingle	property_name_4	property_value_5
-setPropertyValueSingle	property_name_4	property_value_5
-
-#Keybinding
-T	T documentation	T name	T Gui-Path	true	T script
-U	U documentation	U name	U Gui-Path	false	U script
-CTRL+V	CTRL+V documentation	CTRL+V name	CTRL+V Gui-Path	false	CTRL+V script
-
-#Time
-relative	-1d
-
-#Camera
-goToGeo	"Earth"	58.5877	16.1924	2.0e+07
-
-#MarkNodes
-Earth
-Mars
-Moon
-Sun
-
-#AdditionalScripts
-script-1
-script-2
-script-3
diff --git a/tests/profile/minimal.profile b/tests/profile/minimal.profile
index 6f85c12a1f..0b3eb61ed1 100644
--- a/tests/profile/minimal.profile
+++ b/tests/profile/minimal.profile
@@ -1,2 +1,3 @@
-#Version
-12.13
+{
+  "version": { "major": 12, "minor": 13 }
+}
diff --git a/tests/test_profile.cpp b/tests/test_profile.cpp
index 4eacf7360c..834105d882 100644
--- a/tests/test_profile.cpp
+++ b/tests/test_profile.cpp
@@ -32,26 +32,27 @@
 #include <ghoul/filesystem/filesystem.h>
 #include <filesystem>
 #include <fstream>
+#include <json/json.hpp>
 
 using namespace openspace;
 
 namespace {
+    /// Loads the contents of the file and creates a profile from it
     Profile loadProfile(const std::string& filename) {
         if (!std::filesystem::exists(absPath(filename))) {
             throw std::runtime_error("Could not find file)");
         }
 
         std::ifstream f(absPath(filename));
+        std::string content(
+            (std::istreambuf_iterator<char>(f)),
+            std::istreambuf_iterator<char>()
+        );
 
-        std::vector<std::string> lines;
-        std::string line;
-        while (std::getline(f, line)) {
-            lines.push_back(std::move(line));
-        }
-
-        return Profile(lines);
+        return Profile(content);
     }
 
+    /// Loads the contents of the file and returns the raw contents
     std::string loadFile(const std::string& filename) {
         std::ifstream f(absPath(filename));
         std::string content(
@@ -64,287 +65,369 @@ namespace {
 
 //
 // Minimal
+// The absolute minimal profile that can be loaded
 //
 TEST_CASE("Minimal", "[profile]") {
-    constexpr const char* TestFile = "${TESTDIR}/profile/minimal.profile";
-    Profile p = loadProfile(TestFile);
+    constexpr const char* File = "${TESTDIR}/profile/minimal.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
 //
 // Basic functionality
 //
-TEST_CASE("Basic Version One Component", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/basic_version_one_component.profile";
-    Profile p = loadProfile(TestFile);
+TEST_CASE("Basic Meta (full)", "[profile]") {
+    constexpr const char* File = "${TESTDIR}/profile/basic/meta_full.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    constexpr const char* contents = "#Version\n100.0\n";
-    REQUIRE(serialized == contents);
+    std::string contents = loadFile(File);
+
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
-TEST_CASE("Basic Version Two Components", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/basic_version_two_components.profile";
-    Profile p = loadProfile(TestFile);
+TEST_CASE("Basic Meta (empty)", "[profile]") {
+    constexpr const char* File = "${TESTDIR}/profile/basic/meta_empty.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    constexpr const char* contents = "#Version\n100.200\n";
-    REQUIRE(serialized == contents);
+    std::string contents = loadFile(File);
+
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
-TEST_CASE("Basic Meta", "[profile]") {
-    constexpr const char* TestFile = "${TESTDIR}/profile/basic_meta.profile";
-    Profile p = loadProfile(TestFile);
+TEST_CASE("Basic Meta (no name)", "[profile]") {
+    constexpr const char* File = "${TESTDIR}/profile/basic/meta_no_name.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
+}
+
+TEST_CASE("Basic Meta (no version)", "[profile]") {
+    constexpr const char* File = "${TESTDIR}/profile/basic/meta_no_version.profile";
+    Profile p = loadProfile(File);
+
+    std::string serialized = p.serialize();
+    std::string contents = loadFile(File);
+
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
+}
+
+TEST_CASE("Basic Meta (no description)", "[profile]") {
+    constexpr const char* File = "${TESTDIR}/profile/basic/meta_no_description.profile";
+    Profile p = loadProfile(File);
+
+    std::string serialized = p.serialize();
+    std::string contents = loadFile(File);
+
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
+}
+
+TEST_CASE("Basic Meta (no author)", "[profile]") {
+    constexpr const char* File = "${TESTDIR}/profile/basic/meta_no_author.profile";
+    Profile p = loadProfile(File);
+
+    std::string serialized = p.serialize();
+    std::string contents = loadFile(File);
+
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
+}
+
+TEST_CASE("Basic Meta (no url)", "[profile]") {
+    constexpr const char* File = "${TESTDIR}/profile/basic/meta_no_url.profile";
+    Profile p = loadProfile(File);
+
+    std::string serialized = p.serialize();
+    std::string contents = loadFile(File);
+
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
+}
+
+TEST_CASE("Basic Meta (no license)", "[profile]") {
+    constexpr const char* File = "${TESTDIR}/profile/basic/meta_no_license.profile";
+    Profile p = loadProfile(File);
+
+    std::string serialized = p.serialize();
+    std::string contents = loadFile(File);
+
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
 TEST_CASE("Basic Module", "[profile]") {
-    constexpr const char* TestFile = "${TESTDIR}/profile/basic_modules.profile";
-    Profile p = loadProfile(TestFile);
+    constexpr const char* File = "${TESTDIR}/profile/basic/modules.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
 TEST_CASE("Basic Assets", "[profile]") {
-    constexpr const char* TestFile = "${TESTDIR}/profile/basic_assets.profile";
-    Profile p = loadProfile(TestFile);
+    constexpr const char* File = "${TESTDIR}/profile/basic/assets.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
 TEST_CASE("Basic Properties", "[profile]") {
-    constexpr const char* TestFile = "${TESTDIR}/profile/basic_properties.profile";
-    Profile p = loadProfile(TestFile);
+    constexpr const char* File = "${TESTDIR}/profile/basic/properties.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
 TEST_CASE("Basic Keybindings", "[profile]") {
-    constexpr const char* TestFile = "${TESTDIR}/profile/basic_keybindings.profile";
-    Profile p = loadProfile(TestFile);
+    constexpr const char* File = "${TESTDIR}/profile/basic/keybindings.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
 TEST_CASE("Basic Time Relative", "[profile]") {
-    constexpr const char* TestFile = "${TESTDIR}/profile/basic_time_relative.profile";
-    Profile p = loadProfile(TestFile);
+    constexpr const char* File = "${TESTDIR}/profile/basic/time_relative.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
 TEST_CASE("Basic Time Absolute", "[profile]") {
-    constexpr const char* TestFile = "${TESTDIR}/profile/basic_time_absolute.profile";
-    Profile p = loadProfile(TestFile);
+    constexpr const char* File = "${TESTDIR}/profile/basic/time_absolute.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
 TEST_CASE("Basic Delta Times", "[profile]") {
-    constexpr const char* TestFile = "${TESTDIR}/profile/basic_deltatimes.profile";
-    Profile p = loadProfile(TestFile);
+    constexpr const char* File = "${TESTDIR}/profile/basic/deltatimes.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
-TEST_CASE("Basic Camera NavState", "[profile]") {
-    constexpr const char* TestFile = "${TESTDIR}/profile/basic_camera_navstate.profile";
-    Profile p = loadProfile(TestFile);
+TEST_CASE("Basic Camera NavState (full)", "[profile]") {
+    constexpr const char* File = "${TESTDIR}/profile/basic/camera_navstate_full.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
-TEST_CASE("Basic Camera GoToGeo", "[profile]") {
-    constexpr const char* TestFile = "${TESTDIR}/profile/basic_camera_gotogeo.profile";
-    Profile p = loadProfile(TestFile);
+TEST_CASE("Basic Camera NavState (no aim)", "[profile]") {
+    constexpr const char* File =
+        "${TESTDIR}/profile/basic/camera_navstate_no_aim.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
-TEST_CASE("Basic Camera GoToGeo altitude", "[profile]") {
-    constexpr const char* TestFile = 
-        "${TESTDIR}/profile/basic_camera_gotogeo_altitude.profile";
-    Profile p = loadProfile(TestFile);
+TEST_CASE("Basic Camera NavState (no pitch)", "[profile]") {
+    constexpr const char* File =
+        "${TESTDIR}/profile/basic/camera_navstate_no_pitch.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
+}
+
+TEST_CASE("Basic Camera NavState (no up)", "[profile]") {
+    constexpr const char* File = "${TESTDIR}/profile/basic/camera_navstate_no_up.profile";
+    Profile p = loadProfile(File);
+
+    std::string serialized = p.serialize();
+    std::string contents = loadFile(File);
+
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
+}
+
+TEST_CASE("Basic Camera NavState (no yaw)", "[profile]") {
+    constexpr const char* File =
+        "${TESTDIR}/profile/basic/camera_navstate_no_yaw.profile";
+    Profile p = loadProfile(File);
+
+    std::string serialized = p.serialize();
+    std::string contents = loadFile(File);
+
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
+}
+
+TEST_CASE("Basic Camera GoToGeo (full)", "[profile]") {
+    constexpr const char* File = "${TESTDIR}/profile/basic/camera_gotogeo.profile";
+    Profile p = loadProfile(File);
+
+    std::string serialized = p.serialize();
+    std::string contents = loadFile(File);
+
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
+}
+
+TEST_CASE("Basic Camera GoToGeo (with altitude)", "[profile]") {
+    constexpr const char* File =
+        "${TESTDIR}/profile/basic/camera_gotogeo_altitude.profile";
+    Profile p = loadProfile(File);
+
+    std::string serialized = p.serialize();
+    std::string contents = loadFile(File);
+
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
 TEST_CASE("Basic Mark Nodes", "[profile]") {
-    constexpr const char* TestFile = "${TESTDIR}/profile/basic_mark_nodes.profile";
-    Profile p = loadProfile(TestFile);
+    constexpr const char* File = "${TESTDIR}/profile/basic/mark_nodes.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
 TEST_CASE("Basic Additional Scripts", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/basic_additional_scripts.profile";
-    Profile p = loadProfile(TestFile);
+    constexpr const char* File =
+        "${TESTDIR}/profile/basic/additional_scripts.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
 //
 // Integration
 //
 TEST_CASE("Integration Full Test", "[profile]") {
-    constexpr const char* TestFile = "${TESTDIR}/profile/integration_full_test.profile";
-    Profile p = loadProfile(TestFile);
+    constexpr const char* File = "${TESTDIR}/profile/integration/full_test.profile";
+    Profile p = loadProfile(File);
 
     std::string serialized = p.serialize();
-    std::string contents = loadFile(TestFile);
+    std::string contents = loadFile(File);
 
-    REQUIRE(serialized == contents);
-}
-
-TEST_CASE("Integration Full Test Permutation 1", "[profile]") {
-    constexpr const char* TestFileOriginal =
-        "${TESTDIR}/profile/integration_full_test_permutation_base.profile";
-    constexpr const char* TestFilePermutation =
-        "${TESTDIR}/profile/integration_full_test_permutation_1.profile";
-    Profile original = loadProfile(TestFileOriginal);
-    Profile permutation = loadProfile(TestFilePermutation);
-
-    std::string originalSerialized = original.serialize();
-    std::string permutationSerialized = permutation.serialize();
-    REQUIRE(originalSerialized == permutationSerialized);
+    REQUIRE(nlohmann::json::parse(serialized) == nlohmann::json::parse(contents));
 }
 
 //
 // Adding assets
 //
 TEST_CASE("Add asset to empty Profile", "[profile]") {
-    std::vector<std::string> originalSource = {
-        "#Version",
-        "10.11"
-    };
-    Profile p(originalSource);
+    nlohmann::json source;
+    source["version"] = nlohmann::json::object();
+    source["version"]["major"] = 10;
+    source["version"]["minor"] = 11;
+
+    Profile p(source.dump());
     p.addAsset("new-asset");
     std::string originalSerialized = p.serialize();
 
-    std::vector<std::string> targetSource = originalSource;
-    targetSource.push_back("");
-    targetSource.push_back("#Asset");
-    targetSource.push_back("new-asset\t");
-    std::string targetSerialized(Profile(targetSource).serialize());
+    nlohmann::json target = source;
+    target["assets"] = nlohmann::json::array();
+    target["assets"].push_back("new-asset");
+    std::string targetSerialized(Profile(target.dump()).serialize());
 
     REQUIRE(originalSerialized == targetSerialized);
 }
 
 TEST_CASE("Add asset to empty Profile (ignored)", "[profile]") {
-    std::vector<std::string> source = {
-        "#Version",
-        "10.11"
-    };
-    Profile p(source);
+    nlohmann::json source;
+    source["version"] = nlohmann::json::object();
+    source["version"]["major"] = 10;
+    source["version"]["minor"] = 11;
+
+    Profile p(source.dump());
     p.setIgnoreUpdates(true);
     p.addAsset("new-asset");
     std::string originalSerialized = p.serialize();
 
-    std::string targetSerialized(Profile(source).serialize());
+    std::string targetSerialized(Profile(source.dump()).serialize());
 
     REQUIRE(originalSerialized == targetSerialized);
 }
 
 TEST_CASE("Add asset to not-empty Profile", "[profile]") {
-    std::vector<std::string> originalSource = {
-        "#Version",
-        "10.11",
-        "",
-        "#Asset",
-        "old-asset\t"
-    };
-    Profile p(originalSource);
+    nlohmann::json source;
+    source["version"] = nlohmann::json::object();
+    source["version"]["major"] = 10;
+    source["version"]["minor"] = 11;
+    source["assets"] = nlohmann::json::array();
+    source["assets"].push_back("old-asset");
+
+    Profile p(source.dump());
     p.addAsset("new-asset");
     std::string originalSerialized = p.serialize();
 
-    std::vector<std::string> targetSource = originalSource;
-    targetSource.push_back("new-asset\t");
-    std::string targetSerialized(Profile(targetSource).serialize());
+    nlohmann::json target = source;
+    target["assets"].push_back("new-asset");
+    std::string targetSerialized(Profile(target.dump()).serialize());
 
     REQUIRE(originalSerialized == targetSerialized);
 }
 
 TEST_CASE("Add asset to not-empty Profile (ignored)", "[profile]") {
-    std::vector<std::string> source = {
-        "#Version",
-        "10.11",
-        "",
-        "#Asset",
-        "old-asset\t"
-    };
-    Profile p(source);
+    nlohmann::json source;
+    source["version"] = nlohmann::json::object();
+    source["version"]["major"] = 10;
+    source["version"]["minor"] = 11;
+    source["assets"] = nlohmann::json::array();
+    source["assets"].push_back("old-asset");
+
+    Profile p(source.dump());
     p.setIgnoreUpdates(true);
     p.addAsset("new-asset");
     std::string originalSerialized = p.serialize();
 
-    std::string targetSerialized(Profile(source).serialize());
+    std::string targetSerialized(Profile(source.dump()).serialize());
 
     REQUIRE(originalSerialized == targetSerialized);
 }
 
 TEST_CASE("Add duplicate asset", "[profile]") {
-    std::vector<std::string> originalSource = {
-        "#Version",
-        "10.11",
-        "",
-        "#Asset",
-        "old-asset\t"
-    };
-    Profile p(originalSource);
+    nlohmann::json source;
+    source["version"] = nlohmann::json::object();
+    source["version"]["major"] = 10;
+    source["version"]["minor"] = 11;
+    source["assets"] = nlohmann::json::array();
+    source["assets"].push_back("old-asset");
+
+    Profile p(source.dump());
     p.addAsset("new-asset");
     p.addAsset("new-asset");
     std::string originalSerialized = p.serialize();
 
-    std::vector<std::string> targetSource = originalSource;
-    targetSource.push_back("new-asset\t");
-    std::string targetSerialized(Profile(targetSource).serialize());
+    nlohmann::json targetSource = source;
+    targetSource["assets"].push_back("new-asset");
+    std::string targetSerialized(Profile(targetSource.dump()).serialize());
 
     REQUIRE(originalSerialized == targetSerialized);
 }
@@ -353,56 +436,57 @@ TEST_CASE("Add duplicate asset", "[profile]") {
 // Removing assets
 //
 TEST_CASE("Remove asset", "[profile]") {
-    std::vector<std::string> targetSource = {
-        "#Version",
-        "99.88",
-        "",
-        "#Asset",
-        "asset1\t"
-    };
-    std::vector<std::string> originalSource = targetSource;
-    originalSource.push_back("asset2\t");
+    nlohmann::json target;
+    target["version"] = nlohmann::json::object();
+    target["version"]["major"] = 99;
+    target["version"]["minor"] = 88;
+    target["assets"] = nlohmann::json::array();
+    target["assets"].push_back("asset1");
 
-    Profile p(originalSource);
+    nlohmann::json source = target;
+    source["assets"].push_back("asset2");
+
+    Profile p(source.dump());
     p.removeAsset("asset2");
     std::string originalSerialized = p.serialize();
 
-    std::string targetSerialized(Profile(targetSource).serialize());
+    std::string targetSerialized(Profile(target.dump()).serialize());
 
     REQUIRE(originalSerialized == targetSerialized);
 }
 
 TEST_CASE("Remove asset (ignored)", "[profile]") {
-    std::vector<std::string> source = {
-        "#Version",
-        "99.88",
-        "",
-        "#Asset",
-        "asset1\t",
-        "asset2\t"
-    };
+    nlohmann::json target;
+    target["version"] = nlohmann::json::object();
+    target["version"]["major"] = 99;
+    target["version"]["minor"] = 88;
+    target["assets"] = nlohmann::json::array();
+    target["assets"].push_back("asset1");
 
-    Profile p(source);
+    nlohmann::json source = target;
+    source["assets"].push_back("asset2");
+
+
+    Profile p(source.dump());
     p.setIgnoreUpdates(true);
     p.removeAsset("asset2");
     std::string originalSerialized = p.serialize();
 
-    std::string targetSerialized(Profile(source).serialize());
+    std::string targetSerialized(Profile(source.dump()).serialize());
 
     REQUIRE(originalSerialized == targetSerialized);
 }
 
 TEST_CASE("Removing non-exisiting asset", "[profile]") {
-    std::vector<std::string> source = {
-        "#Version",
-        "66.67",
-        "",
-        "#Asset",
-        "asset1\t",
-        "asset3\t"
-    };
+    nlohmann::json source;
+    source["version"] = nlohmann::json::object();
+    source["version"]["major"] = 66;
+    source["version"]["minor"] = 67;
+    source["assets"] = nlohmann::json::array();
+    source["assets"].push_back("asset1");
+    source["assets"].push_back("asset3");
 
-    Profile p(source);
+    Profile p(source.dump());
     REQUIRE_THROWS_WITH(
         p.removeAsset("unknown-asset"),
         Catch::Matchers::Contains("Tried to remove non-existing asset 'unknown-asset'")
@@ -410,16 +494,15 @@ TEST_CASE("Removing non-exisiting asset", "[profile]") {
 }
 
 TEST_CASE("Removing non-exisiting asset (ignored)", "[profile]") {
-    std::vector<std::string> source = {
-        "#Version",
-        "66.67",
-        "",
-        "#Asset",
-        "asset1\t",
-        "asset3\t"
-    };
+    nlohmann::json source;
+    source["version"] = nlohmann::json::object();
+    source["version"]["major"] = 66;
+    source["version"]["minor"] = 67;
+    source["assets"] = nlohmann::json::array();
+    source["assets"].push_back("asset1");
+    source["assets"].push_back("asset3");
 
-    Profile p(source);
+    Profile p(source.dump());
     p.setIgnoreUpdates(true);
     REQUIRE_NOTHROW(p.removeAsset("unknown-asset"));
 }
@@ -446,30 +529,46 @@ TEST_CASE("Save settings to profile", "[profile]") {
     state.yaw = -1.0;
     state.pitch = -2.0;
 
-    std::vector<std::string> baseSource = {
-        "#Version",
-        "1.0"
-    };
-    Profile p(baseSource);
+    nlohmann::json source;
+    source["version"] = nlohmann::json::object();
+    source["version"]["major"] = 1;
+    source["version"]["minor"] = 0;
+    Profile p(source.dump());
     p.saveCurrentSettingsToProfile(owner, "current-time", state);
     std::string serialized = p.serialize();
 
-    std::vector<std::string> targetSource = baseSource;
-    targetSource.push_back("");
-    targetSource.push_back("#Property");
-    targetSource.push_back("setPropertyValueSingle\tbase.p1\t2.000000");
-    targetSource.push_back("setPropertyValueSingle\tbase.p2\t\"test-string\"");
-    targetSource.push_back("");
-    targetSource.push_back("#Camera");
-    targetSource.push_back(
-        "setNavigationState\tanchor\taim\trefFrame\t1.0, 2.0, 3.0\t4.0, 5.0, 6.0\t"
-        "-1.0\t-2.0"
-    );
-    targetSource.push_back("");
-    targetSource.push_back("#Time");
-    targetSource.push_back("absolute\tcurrent-time");
+    nlohmann::json properties = nlohmann::json::array();
+    properties.push_back({
+        { "type", "setPropertyValueSingle" },
+        { "name", "base.p1" },
+        { "value", "2.000000" }
+    });
+    properties.push_back({
+        { "type", "setPropertyValueSingle" },
+        { "name", "base.p2" },
+        { "value", "\"test-string\"" }
+    });
 
-    std::string targetSerialized = Profile(targetSource).serialize();
+    const nlohmann::json camera = {
+        { "type", "setNavigationState" },
+        { "anchor", "anchor" },
+        { "aim", "aim" },
+        { "frame", "refFrame" },
+        { "position", { { "x", 1.0 }, { "y", 2.0 }, { "z", 3.0 } } },
+        { "up", { { "x", 4.0 }, { "y", 5.0 }, { "z", 6.0 } } },
+        { "yaw", -1.0 },
+        { "pitch", -2.0 }
+    };
+    const nlohmann::json time = {
+        { "type", "absolute" } ,
+        { "value", "current-time" }
+    };
+    nlohmann::json target = source;
+    target["properties"] = properties;
+    target["camera"] = camera;
+    target["time"] = time;
+
+    std::string targetSerialized = Profile(target.dump()).serialize();
 
     REQUIRE(serialized == targetSerialized);
 }
@@ -477,361 +576,577 @@ TEST_CASE("Save settings to profile", "[profile]") {
 //
 // Error states
 //
-TEST_CASE("Error unrecognized header", "[profile]") {
+//
+// Version
+//
+TEST_CASE("(Error) Version: Missing value 'major'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_unrecognized_header.profile";
+        "${TESTDIR}/profile/error/version/missing_major.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Invalid section header") &&
-        Catch::Matchers::Contains("#Azzet")
+        Catch::Matchers::Contains("'version.major' field is missing")
     );
 }
 
-TEST_CASE("Error missing separator line", "[profile}") {
+TEST_CASE("(Error) Version: Missing value 'minor'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_missing_separator_line.profile";
+        "${TESTDIR}/profile/error/version/missing_minor.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Sections in profile must be separated by empty lines")
+        Catch::Matchers::Contains("'version.minor' field is missing")
     );
 }
 
-TEST_CASE("Error version not first header", "[profile]") {
+TEST_CASE("(Error) Version: Wrong type 'major'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_version_not_first.profile";
+        "${TESTDIR}/profile/error/version/wrongtype_major.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("First header in the file must be Version") &&
-        Catch::Matchers::Contains("#Asset")
+        Catch::Matchers::Contains("'version.major' must be a number")
     );
 }
 
-TEST_CASE("Error two version sections", "[profile]") {
+TEST_CASE("(Error) Version: Wrong type 'minor'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_two_version_sections.profile";
+        "${TESTDIR}/profile/error/version/wrongtype_minor.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Version section can only appear once per profile")
+        Catch::Matchers::Contains("'version.minor' must be a number")
     );
 }
 
-TEST_CASE("Error two meta sections", "[profile]") {
+TEST_CASE("(Error) Version: Wrong type 'major' and 'minor'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_two_meta_sections.profile";
+        "${TESTDIR}/profile/error/version/wrongtype_major_minor.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Meta section can only appear once per profile")
+        Catch::Matchers::Contains("'version.major' must be a number")
     );
 }
 
 
-TEST_CASE("Error two camera sections", "[profile]") {
+//
+// Modules
+//
+
+TEST_CASE("(Error) Module: Missing value 'name'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_two_camera_sections.profile";
+        "${TESTDIR}/profile/error/module/missing_name.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Camera section can only appear once per profile")
+        Catch::Matchers::Contains("'module.name' field is missing")
     );
 }
 
-TEST_CASE("Error two time sections", "[profile]") {
+TEST_CASE("(Error) Module: Wrong type 'name'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_two_time_sections.profile";
+        "${TESTDIR}/profile/error/module/wrongtype_name.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Time section can only appear once per profile")
+        Catch::Matchers::Contains("'module.name' must be a string")
     );
 }
 
-TEST_CASE("Error version malformed component", "[profile]") {
+TEST_CASE("(Error) Module: Wrong type 'loadedInstruction'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_version_malformed_component.profile";
+        "${TESTDIR}/profile/error/module/wrongtype_loadedInstruction.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Error parsing Version. Version number is not a number")
+        Catch::Matchers::Contains("'module.loadedInstruction' must be a string")
     );
 }
 
-TEST_CASE("Error version too many components", "[profile]") {
+TEST_CASE("(Error) Module: Wrong type 'notLoadedInstruction'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_version_too_many_components.profile";
+        "${TESTDIR}/profile/error/module/wrongtype_notLoadedInstruction.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 1-2 version components, got 3")
+        Catch::Matchers::Contains("'module.notLoadedInstruction' must be a string")
     );
 }
 
-TEST_CASE("Error module too few parameters", "[profile]") {
+
+//
+// Property
+//
+TEST_CASE("(Error) Property: Missing value 'name'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_module_too_few_parameters.profile";
+        "${TESTDIR}/profile/error/property/missing_name.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 3 fields in a Module entry, got 1")
+        Catch::Matchers::Contains("'property.name' field is missing")
     );
 }
 
-TEST_CASE("Error module too many parameters", "[profile]") {
+TEST_CASE("(Error) Property: Missing value 'value'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_module_too_many_parameters.profile";
+        "${TESTDIR}/profile/error/property/missing_value.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 3 fields in a Module entry, got 4")
+        Catch::Matchers::Contains("'property.value' field is missing")
     );
 }
 
-TEST_CASE("Error asset too few parameters", "[profile]") {
+TEST_CASE("(Error) Property: Missing value 'name' and 'value'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_asset_too_few_parameters.profile";
+        "${TESTDIR}/profile/error/property/missing_name_value.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 2 fields in an Asset entry, got 1")
+        Catch::Matchers::Contains("'property.name' field is missing")
     );
 }
 
-TEST_CASE("Error asset too many parameters", "[profile]") {
+TEST_CASE("(Error) Property: Wrong value 'type'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_asset_too_many_parameters.profile";
+        "${TESTDIR}/profile/error/property/wrongvalue_type.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 2 fields in an Asset entry, got 3")
+        Catch::Matchers::Contains("Unknown property set type")
     );
 }
 
-TEST_CASE("Error property too few parameters", "[profile]") {
+TEST_CASE("(Error) Property: Wrong type 'name'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_property_too_few_parameters.profile";
+        "${TESTDIR}/profile/error/property/wrongtype_name.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 3 fields in Property entry, got 1")
+        Catch::Matchers::Contains("'property.name' must be a string")
     );
 }
 
-TEST_CASE("Error property too many parameters", "[profile]") {
+TEST_CASE("(Error) Property: Wrong type 'value'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_property_too_many_parameters.profile";
+        "${TESTDIR}/profile/error/property/wrongtype_value.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 3 fields in Property entry, got 4")
+        Catch::Matchers::Contains("'property.value' must be a string")
     );
 }
 
-TEST_CASE("Error property wrong parameter type 'type'", "[profile]") {
+
+//
+// Keybinding
+//
+TEST_CASE("(Error) Keybinding: Missing value 'key'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_property_wrong_parameter_value_type.profile";
+        "${TESTDIR}/profile/error/keybinding/missing_key.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains(
-            "Expected property set type 'setPropertyValue' or "
-            "'setPropertyValueSingle', got 'unknown-set-property-command'"
-        )
+        Catch::Matchers::Contains("'keybinding.key' field is missing")
     );
 }
 
-TEST_CASE("Error keybinding too few parameters", "[profile]") {
+TEST_CASE("(Error) Keybinding: Missing value 'documentation'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_keybinding_too_few_parameters.profile";
+        "${TESTDIR}/profile/error/keybinding/missing_documentation.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 6 fields in Keybinding entry, got 1")
+        Catch::Matchers::Contains("'keybinding.documentation' field is missing")
     );
 }
 
-TEST_CASE("Error keybinding too many parameters", "[profile]") {
+TEST_CASE("(Error) Keybinding: Missing value 'name'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_keybinding_too_many_parameters.profile";
+        "${TESTDIR}/profile/error/keybinding/missing_name.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 6 fields in Keybinding entry, got 7")
+        Catch::Matchers::Contains("'keybinding.name' field is missing")
     );
 }
 
-TEST_CASE("Error keybinding wrong parameter value 'key'", "[profile]") {
+TEST_CASE("(Error) Keybinding: Missing value 'gui_path'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_keybinding_wrong_parameter_value_key.profile";
+        "${TESTDIR}/profile/error/keybinding/missing_guipath.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'keybinding.gui_path' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Keybinding: Missing value 'is_local'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/keybinding/missing_islocal.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'keybinding.is_local' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Keybinding: Wrong value 'key'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/keybinding/wrongvalue_key.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
         Catch::Matchers::Contains("Could not find key for 'F50'")
     );
 }
 
-TEST_CASE("Error keybinding wrong parameter value 'key, modifier'", "[profile]") {
+TEST_CASE("(Error) Keybinding: Wrong value 'key, modifier'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_keybinding_wrong_parameter_value_modifier.profile";
+        "${TESTDIR}/profile/error/keybinding/wrongvalue_modifier.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
         Catch::Matchers::Contains("Unknown modifier key 'KEYKEY'")
     );
 }
 
-TEST_CASE("Error keybinding wrong parameter type 'local'", "[profile]") {
+TEST_CASE("(Error) Keybinding: Wrong type 'documentation'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_keybinding_wrong_parameter_type_local.profile";
+        "${TESTDIR}/profile/error/keybinding/wrongtype_documentation.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 'false' or 'true' for the local path, got ER")
+        Catch::Matchers::Contains("'keybinding.documentation' must be a string")
     );
 }
 
-TEST_CASE("Error time too few parameters", "[profile]") {
+TEST_CASE("(Error) Keybinding: Wrong type 'gui_path'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_time_too_few_parameters.profile";
+        "${TESTDIR}/profile/error/keybinding/wrongtype_guipath.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 2 fields in Time entry, got 1")
+        Catch::Matchers::Contains("'keybinding.gui_path' must be a string")
     );
 }
 
-TEST_CASE("Error time too many parameters", "[profile]") {
+TEST_CASE("(Error) Keybinding: Wrong type 'is_local'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_time_too_many_parameters.profile";
+        "${TESTDIR}/profile/error/keybinding/wrongtype_islocal.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 2 fields in Time entry, got 3")
+        Catch::Matchers::Contains("'keybinding.is_local' must be a boolean")
     );
 }
 
-TEST_CASE("Error time wrong parameter type 'type'", "[profile]") {
+TEST_CASE("(Error) Keybinding: Wrong type 'name'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_time_wrong_parameter_value_type.profile";
+        "${TESTDIR}/profile/error/keybinding/wrongtype_name.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains(
-            "Expected 'absolute' or 'relative' for the type, got ER"
-        )
+        Catch::Matchers::Contains("'keybinding.name' must be a string")
     );
 }
 
-TEST_CASE("Error deltatimes wrong parameter type", "[profile]") {
+TEST_CASE("(Error) Keybinding: Wrong type 'script'", "[profile]") {
     constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_deltatimes_wrong_parameter_value_type.profile";
+        "${TESTDIR}/profile/error/keybinding/wrongtype_script.profile";
     REQUIRE_THROWS_WITH(
         loadProfile(TestFile),
-        Catch::Matchers::Contains(
-            "Expected a number for delta time entry, got 'notANumber'" 
-        )
-    );
-}
-
-TEST_CASE("Error camera navigation state too few parameters", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_camera_navstate_too_few_parameters.profile";
-    REQUIRE_THROWS_WITH(
-        loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 8 fields in the Camera entry, got 1")
-    );
-}
-
-TEST_CASE("Error camera navigation state too many parameters", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_camera_navstate_too_many_parameters.profile";
-    REQUIRE_THROWS_WITH(
-        loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 8 fields in the Camera entry, got 9")
-    );
-}
-
-TEST_CASE("Error camera navigation state too few parameters in position", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/"
-        "error_camera_navstate_wrong_parameter_too_few_components_position.profile";
-    REQUIRE_THROWS_WITH(
-        loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 3 fields for the camera's position, got 2")
-    );
-}
-
-TEST_CASE("Error camera navigation state too many parameters in position", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/"
-        "error_camera_navstate_wrong_parameter_too_many_components_position.profile";
-    REQUIRE_THROWS_WITH(
-        loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 3 fields for the camera's position, got 4")
-    );
-}
-
-TEST_CASE("Error camera navigation state wrong parameter type position", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/"
-        "error_camera_navstate_wrong_parameter_wrong_component_type_position.profile";
-    REQUIRE_THROWS_WITH(
-        loadProfile(TestFile),
-        Catch::Matchers::Contains("Camera's position components must be numbers")
-    );
-}
-
-TEST_CASE("Error camera navigation state too few parameters in up vector", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/"
-        "error_camera_navstate_wrong_parameter_too_few_components_up.profile";
-    REQUIRE_THROWS_WITH(
-        loadProfile(TestFile),
-        Catch::Matchers::Contains(
-            "Expected 0 or 3 fields for the camera's up vector, got 2"
-        )
-    );
-}
-
-TEST_CASE("Error camera navigation state wrong parameter type up vector", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/"
-        "error_camera_navstate_wrong_parameter_wrong_component_type_up.profile";
-    REQUIRE_THROWS_WITH(
-        loadProfile(TestFile),
-        Catch::Matchers::Contains("Camera's up vector components must be numbers")
-    );
-}
-
-TEST_CASE("Error camera navigation state wrong parameter type up yaw", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/"
-        "error_camera_navstate_wrong_parameter_type_yaw.profile";
-    REQUIRE_THROWS_WITH(
-        loadProfile(TestFile),
-        Catch::Matchers::Contains("Camera's yaw value must be a number")
-    );
-}
-
-TEST_CASE("Error camera navigation state wrong parameter type up pitch", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/"
-        "error_camera_navstate_wrong_parameter_type_pitch.profile";
-    REQUIRE_THROWS_WITH(
-        loadProfile(TestFile),
-        Catch::Matchers::Contains("Camera's pitch value must be a number")
-    );
-}
-
-TEST_CASE("Error camera goToGeo too few parameters", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_camera_gotogeo_too_few_parameters.profile";
-    REQUIRE_THROWS_WITH(
-        loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 5 fields in the Camera entry, got 1")
-    );
-}
-
-TEST_CASE("Error camera goToGeo too many parameters", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_camera_gotogeo_too_many_parameters.profile";
-    REQUIRE_THROWS_WITH(
-        loadProfile(TestFile),
-        Catch::Matchers::Contains("Expected 5 fields in the Camera entry, got 6")
-    );
-}
-
-TEST_CASE("Error camera wrong parameter value 'type'", "[profile]") {
-    constexpr const char* TestFile =
-        "${TESTDIR}/profile/error_camera_wrong_parameter_value_type.profile";
-    REQUIRE_THROWS_WITH(
-        loadProfile(TestFile),
-        Catch::Matchers::Contains(
-            "Expected 'setNavigationState' or 'goToGeo' for the type, got ER"
-        )
+        Catch::Matchers::Contains("'keybinding.script' must be a string")
     );
 }
 
 
+//
+// Time
+//
+TEST_CASE("(Error) Time: Wrong value 'type'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/time/wrongvalue_type.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("Unknown time type")
+    );
+}
 
+TEST_CASE("(Error) Time (absolute): Missing value 'type'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/time/missing_type.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'time.type' field is missing")
+    );
+}
 
+TEST_CASE("(Error) Time (relative): Missing value 'value'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/time/relative_missing_value.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'time.value' field is missing")
+    );
+}
 
+//
+// Deltatime
+//
+TEST_CASE("(Error) Deltatimes: Wrong type", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/deltatimes/wrongtype_value.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("type must be number, but is string")
+    );
+}
+
+//
+// Camera
+//
+TEST_CASE("(Error) Camera: Wrong value 'type'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/wrongvalue_type.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("Unknown camera type")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Missing value 'anchor'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_missing_anchor.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.anchor' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Missing value 'frame'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_missing_frame.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.frame' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Missing value 'position'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_missing_position.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.position' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Wrong type 'anchor'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_wrongtype_anchor.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.anchor' must be a string")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Wrong type 'aim'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_wrongtype_aim.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.aim' must be a string")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Wrong type 'frame'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_wrongtype_frame.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.frame' must be a string")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Wrong type 'position'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_wrongtype_position.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.position' must be an object")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Missing value 'position.x'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_missing_position_x.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.position.x' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Wrong type 'position.x'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_wrongtype_position_x.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.position.x' must be a number")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Missing value 'position.y'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_missing_position_y.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.position.y' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Wrong type 'position.y'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_wrongtype_position_y.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.position.y' must be a number")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Missing value 'position.z'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_missing_position_z.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.position.z' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Wrong type 'position.z'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_wrongtype_position_z.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.position.z' must be a number")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Wrong type 'up'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_wrongtype_up.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.up' must be an object")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Missing value 'up.x'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_missing_up_x.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.up.x' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Wrong type 'up.x'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_wrongtype_up_x.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.up.x' must be a number")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Missing value 'up.y'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_missing_up_y.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.up.y' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Wrong type 'up.y'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_wrongtype_up_y.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.up.y' must be a number")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Missing value 'up.z'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_missing_up_z.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.up.z' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Wrong type 'up.z'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_wrongtype_up_z.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.up.z' must be a number")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Wrong type 'yaw'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_wrongtype_yaw.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.yaw' must be a number")
+    );
+}
+
+TEST_CASE("(Error) Camera (NavState): Wrong type 'pitch'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/navstate_wrongtype_pitch.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("camera.pitch' must be a number")
+    );
+}
+
+TEST_CASE("(Error) Camera (GoToGeo): Missing value 'anchor'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/gotogeo_missing_anchor.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.anchor' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Camera (GoToGeo): Missing value 'latitude'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/gotogeo_missing_latitude.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.latitude' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Camera (GoToGeo): Missing value 'longitude'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/gotogeo_missing_longitude.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.longitude' field is missing")
+    );
+}
+
+TEST_CASE("(Error) Camera (GoToGeo): Wrong type 'anchor'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/gotogeo_wrongtype_anchor.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.anchor' must be a string")
+    );
+}
+
+TEST_CASE("(Error) Camera (GoToGeo): Wrong type 'latitude'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/gotogeo_wrongtype_latitude.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.latitude' must be a number")
+    );
+}
+
+TEST_CASE("(Error) Camera (GoToGeo): Wrong type 'longitude'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/gotogeo_wrongtype_longitude.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.longitude' must be a number")
+    );
+}
+
+TEST_CASE("(Error) Camera (GoToGeo): Wrong type 'altitude'", "[profile]") {
+    constexpr const char* TestFile =
+        "${TESTDIR}/profile/error/camera/gotogeo_wrongtype_altitude.profile";
+    REQUIRE_THROWS_WITH(
+        loadProfile(TestFile),
+        Catch::Matchers::Contains("'camera.altitude' must be a number")
+    );
+}
diff --git a/tests/test_spicemanager.cpp b/tests/test_spicemanager.cpp
index f7cc53651e..3f54a37a1f 100644
--- a/tests/test_spicemanager.cpp
+++ b/tests/test_spicemanager.cpp
@@ -376,7 +376,6 @@ TEST_CASE("SpiceManager: Transform matrix", "[spicemanager]") {
 
    double et;
    double state[6];
-   double state_t[6];
    double lt;
    double referenceMatrix[6][6];
 
diff --git a/tests/test_timequantizer.cpp b/tests/test_timequantizer.cpp
index d97f845c98..0eee8201ed 100644
--- a/tests/test_timequantizer.cpp
+++ b/tests/test_timequantizer.cpp
@@ -186,7 +186,7 @@ TEST_CASE("TimeQuantizer: Test days resolution", "[timequantizer]") {
     singleTimeTest(testT, t1, false, "2021-11-07T00:00:00", "2021-11-07T00:00:00.000");
 
     t1.setStartEndRange("2019-02-21T00:00:00", "2021-09-01T00:00:00");
-    t1.setResolution("11d");
+    t1.setResolution("1d");
 
     singleTimeTest(testT, t1, true, "2020-03-01T00:30:00", "2020-03-01T00:00:00.000");
     singleTimeTest(testT, t1, true, "2019-03-04T00:00:02", "2019-03-04T00:00:00.000");