From fe284506ac75d05ae07e6694b04829d052e7fa83 Mon Sep 17 00:00:00 2001
From: Zachary Wasserman <zach@dactiv.llc>
Date: Wed, 25 Sep 2019 20:35:15 -0700
Subject: [PATCH] Fix typo in ValidationMap type name (#5837)

---
 .../tables/account_policy_data.cpp            |  3 +-
 tests/integration/tables/acpi_tables.cpp      |  3 +-
 tests/integration/tables/ad_config.cpp        |  3 +-
 tests/integration/tables/alf.cpp              |  3 +-
 tests/integration/tables/alf_exceptions.cpp   |  3 +-
 .../integration/tables/alf_explicit_auths.cpp |  3 +-
 tests/integration/tables/alf_services.cpp     |  3 +-
 tests/integration/tables/app_schemes.cpp      |  3 +-
 tests/integration/tables/appcompat_shims.cpp  |  3 +-
 tests/integration/tables/apps.cpp             |  3 +-
 tests/integration/tables/apt_sources.cpp      |  3 +-
 tests/integration/tables/arp_cache.cpp        |  3 +-
 tests/integration/tables/asl.cpp              |  3 +-
 tests/integration/tables/atom_packages.cpp    |  3 +-
 tests/integration/tables/augeas.cpp           |  3 +-
 tests/integration/tables/authenticode.cpp     |  3 +-
 .../tables/authorization_mechanisms.cpp       |  3 +-
 tests/integration/tables/authorizations.cpp   |  3 +-
 tests/integration/tables/authorized_keys.cpp  |  3 +-
 tests/integration/tables/autoexec.cpp         |  3 +-
 tests/integration/tables/battery.cpp          |  3 +-
 tests/integration/tables/bitlocker_info.cpp   |  3 +-
 tests/integration/tables/block_devices.cpp    |  3 +-
 tests/integration/tables/browser_plugins.cpp  |  3 +-
 .../integration/tables/carbon_black_info.cpp  |  3 +-
 tests/integration/tables/carves.cpp           |  3 +-
 tests/integration/tables/certificates.cpp     |  3 +-
 .../tables/chocolatey_packages.cpp            |  3 +-
 .../integration/tables/chrome_extensions.cpp  |  3 +-
 tests/integration/tables/cpu_info.cpp         | 25 ++++++-------
 tests/integration/tables/cpu_time.cpp         |  3 +-
 tests/integration/tables/cpuid.cpp            |  3 +-
 tests/integration/tables/crashes.cpp          |  3 +-
 tests/integration/tables/crontab.cpp          | 33 ++++++++---------
 .../integration/tables/cups_destinations.cpp  |  3 +-
 tests/integration/tables/cups_jobs.cpp        |  3 +-
 tests/integration/tables/curl.cpp             |  3 +-
 tests/integration/tables/curl_certificate.cpp |  3 +-
 tests/integration/tables/deb_packages.cpp     |  2 +-
 tests/integration/tables/device_file.cpp      |  3 +-
 tests/integration/tables/device_firmware.cpp  |  3 +-
 tests/integration/tables/device_hash.cpp      |  3 +-
 .../integration/tables/device_partitions.cpp  |  3 +-
 tests/integration/tables/disk_encryption.cpp  |  3 +-
 tests/integration/tables/disk_events.cpp      |  3 +-
 tests/integration/tables/disk_info.cpp        |  3 +-
 tests/integration/tables/dns_resolvers.cpp    |  3 +-
 .../tables/docker_container_labels.cpp        |  3 +-
 .../tables/docker_container_mounts.cpp        |  3 +-
 .../tables/docker_container_networks.cpp      |  3 +-
 .../tables/docker_container_ports.cpp         |  3 +-
 .../tables/docker_container_processes.cpp     |  3 +-
 .../tables/docker_container_stats.cpp         |  3 +-
 .../integration/tables/docker_containers.cpp  |  3 +-
 .../tables/docker_image_labels.cpp            |  3 +-
 tests/integration/tables/docker_images.cpp    |  3 +-
 tests/integration/tables/docker_info.cpp      |  3 +-
 .../tables/docker_network_labels.cpp          |  3 +-
 tests/integration/tables/docker_networks.cpp  |  3 +-
 tests/integration/tables/docker_version.cpp   |  3 +-
 .../tables/docker_volume_labels.cpp           |  3 +-
 tests/integration/tables/docker_volumes.cpp   |  3 +-
 tests/integration/tables/drivers.cpp          |  3 +-
 .../tables/ec2_instance_metadata.cpp          |  3 +-
 .../integration/tables/ec2_instance_tags.cpp  |  3 +-
 tests/integration/tables/elf_dynamic.cpp      |  3 +-
 tests/integration/tables/elf_info.cpp         |  3 +-
 tests/integration/tables/elf_sections.cpp     |  3 +-
 tests/integration/tables/elf_segments.cpp     |  3 +-
 tests/integration/tables/elf_symbols.cpp      |  3 +-
 tests/integration/tables/etc_hosts.cpp        |  3 +-
 tests/integration/tables/etc_protocols.cpp    |  3 +-
 tests/integration/tables/etc_services.cpp     |  3 +-
 tests/integration/tables/event_taps.cpp       |  3 +-
 tests/integration/tables/example.cpp          |  3 +-
 .../tables/extended_attributes.cpp            |  3 +-
 .../integration/tables/fan_speed_sensors.cpp  |  3 +-
 tests/integration/tables/fbsd_kmods.cpp       |  3 +-
 tests/integration/tables/file.cpp             | 35 +++++++++---------
 tests/integration/tables/file_events.cpp      |  3 +-
 tests/integration/tables/firefox_addons.cpp   |  3 +-
 tests/integration/tables/gatekeeper.cpp       |  3 +-
 .../tables/gatekeeper_approved_apps.cpp       |  3 +-
 tests/integration/tables/groups.cpp           |  3 +-
 tests/integration/tables/hardware_events.cpp  |  3 +-
 tests/integration/tables/hash.cpp             |  2 +-
 tests/integration/tables/helper.cpp           |  6 +--
 tests/integration/tables/helper.h             |  9 ++---
 .../integration/tables/homebrew_packages.cpp  |  3 +-
 tests/integration/tables/ibridge.cpp          |  2 +-
 tests/integration/tables/ie_extensions.cpp    |  3 +-
 tests/integration/tables/intel_me_info.cpp    |  3 +-
 .../tables/interface_addresses.cpp            |  3 +-
 .../integration/tables/interface_details.cpp  |  3 +-
 tests/integration/tables/interface_ipv6.cpp   |  2 +-
 tests/integration/tables/iokit_devicetree.cpp |  3 +-
 tests/integration/tables/iokit_registry.cpp   |  3 +-
 tests/integration/tables/iptables.cpp         | 37 +++++++++----------
 .../integration/tables/kernel_extensions.cpp  |  3 +-
 tests/integration/tables/kernel_info.cpp      |  8 ++--
 tests/integration/tables/kernel_integrity.cpp |  3 +-
 tests/integration/tables/kernel_modules.cpp   |  3 +-
 tests/integration/tables/kernel_panics.cpp    |  3 +-
 tests/integration/tables/keychain_acls.cpp    |  3 +-
 tests/integration/tables/keychain_items.cpp   |  3 +-
 tests/integration/tables/known_hosts.cpp      |  3 +-
 .../tables/kva_speculative_info.cpp           |  3 +-
 tests/integration/tables/last.cpp             |  3 +-
 tests/integration/tables/launchd.cpp          |  3 +-
 .../integration/tables/launchd_overrides.cpp  |  3 +-
 tests/integration/tables/listening_ports.cpp  |  3 +-
 tests/integration/tables/lldp_neighbors.cpp   |  3 +-
 tests/integration/tables/load_average.cpp     |  3 +-
 tests/integration/tables/logged_in_users.cpp  |  3 +-
 tests/integration/tables/logical_drives.cpp   |  3 +-
 tests/integration/tables/logon_sessions.cpp   |  3 +-
 tests/integration/tables/magic.cpp            |  3 +-
 tests/integration/tables/managed_policies.cpp |  3 +-
 tests/integration/tables/md_devices.cpp       |  3 +-
 tests/integration/tables/md_drives.cpp        |  3 +-
 tests/integration/tables/md_personalities.cpp |  3 +-
 tests/integration/tables/mdfind.cpp           |  3 +-
 .../tables/memory_array_mapped_addresses.cpp  |  3 +-
 tests/integration/tables/memory_arrays.cpp    |  3 +-
 .../tables/memory_device_mapped_addresses.cpp |  3 +-
 tests/integration/tables/memory_devices.cpp   |  3 +-
 .../integration/tables/memory_error_info.cpp  |  3 +-
 tests/integration/tables/memory_info.cpp      |  3 +-
 tests/integration/tables/memory_map.cpp       |  6 +--
 tests/integration/tables/mounts.cpp           |  3 +-
 tests/integration/tables/msr.cpp              |  3 +-
 tests/integration/tables/nfs_shares.cpp       |  3 +-
 tests/integration/tables/npm_packages.cpp     |  3 +-
 tests/integration/tables/ntdomains.cpp        |  2 +-
 .../tables/ntfs_acl_permissions.cpp           |  3 +-
 tests/integration/tables/nvram.cpp            |  3 +-
 tests/integration/tables/oem_strings.cpp      |  3 +-
 tests/integration/tables/opera_extensions.cpp |  3 +-
 tests/integration/tables/os_version.cpp       |  2 +-
 tests/integration/tables/osquery_events.cpp   |  3 +-
 .../integration/tables/osquery_extensions.cpp |  3 +-
 tests/integration/tables/osquery_flags.cpp    |  3 +-
 tests/integration/tables/osquery_info.cpp     |  3 +-
 tests/integration/tables/osquery_packs.cpp    |  3 +-
 tests/integration/tables/osquery_registry.cpp |  3 +-
 tests/integration/tables/osquery_schedule.cpp |  3 +-
 tests/integration/tables/package_bom.cpp      |  3 +-
 .../tables/package_install_history.cpp        |  3 +-
 tests/integration/tables/package_receipts.cpp |  3 +-
 tests/integration/tables/patches.cpp          |  3 +-
 tests/integration/tables/pci_devices.cpp      |  3 +-
 .../tables/physical_disk_performance.cpp      |  3 +-
 tests/integration/tables/pipes.cpp            |  3 +-
 tests/integration/tables/pkg_packages.cpp     |  3 +-
 tests/integration/tables/platform_info.cpp    |  3 +-
 tests/integration/tables/plist.cpp            |  3 +-
 tests/integration/tables/portage_keywords.cpp |  3 +-
 tests/integration/tables/portage_packages.cpp |  3 +-
 tests/integration/tables/portage_use.cpp      |  3 +-
 tests/integration/tables/power_sensors.cpp    |  3 +-
 .../integration/tables/powershell_events.cpp  |  3 +-
 tests/integration/tables/preferences.cpp      |  3 +-
 tests/integration/tables/process_envs.cpp     |  3 +-
 tests/integration/tables/process_events.cpp   |  3 +-
 .../tables/process_file_events.cpp            |  3 +-
 .../integration/tables/process_memory_map.cpp |  3 +-
 .../integration/tables/process_namespaces.cpp |  3 +-
 .../integration/tables/process_open_files.cpp |  2 +-
 .../tables/process_open_sockets.cpp           |  3 +-
 tests/integration/tables/processes.cpp        |  3 +-
 tests/integration/tables/programs.cpp         | 18 ++++-----
 .../integration/tables/prometheus_metrics.cpp |  3 +-
 tests/integration/tables/python_packages.cpp  |  3 +-
 tests/integration/tables/quicklook_cache.cpp  |  3 +-
 tests/integration/tables/registry.cpp         |  3 +-
 tests/integration/tables/routes.cpp           |  3 +-
 .../integration/tables/rpm_package_files.cpp  |  3 +-
 tests/integration/tables/rpm_packages.cpp     |  3 +-
 tests/integration/tables/running_apps.cpp     |  7 ++--
 .../integration/tables/safari_extensions.cpp  |  3 +-
 tests/integration/tables/sandboxes.cpp        |  2 +-
 tests/integration/tables/scheduled_tasks.cpp  |  3 +-
 tests/integration/tables/selinux_events.cpp   |  3 +-
 tests/integration/tables/services.cpp         |  3 +-
 tests/integration/tables/shadow.cpp           |  3 +-
 tests/integration/tables/shared_folders.cpp   |  3 +-
 tests/integration/tables/shared_memory.cpp    |  3 +-
 tests/integration/tables/shared_resources.cpp |  3 +-
 .../tables/sharing_preferences.cpp            |  3 +-
 tests/integration/tables/shell_history.cpp    |  3 +-
 tests/integration/tables/signature.cpp        |  3 +-
 tests/integration/tables/sip_config.cpp       |  3 +-
 tests/integration/tables/smart_drive_info.cpp |  3 +-
 tests/integration/tables/smbios_tables.cpp    |  3 +-
 tests/integration/tables/smc_keys.cpp         |  3 +-
 tests/integration/tables/socket_events.cpp    |  3 +-
 tests/integration/tables/ssh_configs.cpp      |  3 +-
 tests/integration/tables/startup_items.cpp    |  3 +-
 tests/integration/tables/sudoers.cpp          |  3 +-
 tests/integration/tables/suid_bin.cpp         |  3 +-
 tests/integration/tables/syslog_events.cpp    |  3 +-
 tests/integration/tables/system_controls.cpp  | 31 ++++++++--------
 tests/integration/tables/system_info.cpp      | 31 ++++++++--------
 .../tables/temperature_sensors.cpp            |  3 +-
 tests/integration/tables/time.cpp             |  2 +-
 .../tables/time_machine_backups.cpp           |  3 +-
 .../tables/time_machine_destinations.cpp      |  3 +-
 tests/integration/tables/ulimit_info.cpp      |  3 +-
 tests/integration/tables/uptime.cpp           | 10 ++---
 tests/integration/tables/usb_devices.cpp      |  3 +-
 tests/integration/tables/user_events.cpp      |  3 +-
 tests/integration/tables/user_groups.cpp      |  5 +--
 .../tables/user_interaction_events.cpp        |  3 +-
 tests/integration/tables/user_ssh_keys.cpp    |  3 +-
 tests/integration/tables/users.cpp            |  2 +-
 tests/integration/tables/video_info.cpp       |  3 +-
 .../tables/virtual_memory_info.cpp            |  3 +-
 tests/integration/tables/wifi_networks.cpp    |  3 +-
 tests/integration/tables/wifi_status.cpp      |  3 +-
 tests/integration/tables/wifi_survey.cpp      |  3 +-
 tests/integration/tables/winbaseobj.cpp       |  3 +-
 tests/integration/tables/windows_crashes.cpp  |  3 +-
 tests/integration/tables/windows_events.cpp   |  3 +-
 .../tables/windows_security_products.cpp      |  2 +-
 tests/integration/tables/wmi_bios_info.cpp    |  3 +-
 .../tables/wmi_cli_event_consumers.cpp        |  3 +-
 .../integration/tables/wmi_event_filters.cpp  |  3 +-
 .../tables/wmi_filter_consumer_binding.cpp    |  3 +-
 .../tables/wmi_script_event_consumers.cpp     |  3 +-
 tests/integration/tables/xprotect_entries.cpp |  3 +-
 tests/integration/tables/xprotect_meta.cpp    |  3 +-
 tests/integration/tables/xprotect_reports.cpp |  3 +-
 tests/integration/tables/yara.cpp             |  3 +-
 tests/integration/tables/yara_events.cpp      |  3 +-
 tests/integration/tables/yum_sources.cpp      |  3 +-
 235 files changed, 347 insertions(+), 566 deletions(-)

diff --git a/tests/integration/tables/account_policy_data.cpp b/tests/integration/tables/account_policy_data.cpp
index 06ffbb2e..825af4e9 100644
--- a/tests/integration/tables/account_policy_data.cpp
+++ b/tests/integration/tables/account_policy_data.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(accountPolicyData, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"uid", IntType}
   //      {"creation_time", NormalType}
   //      {"failed_login_count", IntType}
diff --git a/tests/integration/tables/acpi_tables.cpp b/tests/integration/tables/acpi_tables.cpp
index 9912757a..d54de88f 100644
--- a/tests/integration/tables/acpi_tables.cpp
+++ b/tests/integration/tables/acpi_tables.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(acpiTables, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"size", IntType}
   //      {"md5", NormalType}
diff --git a/tests/integration/tables/ad_config.cpp b/tests/integration/tables/ad_config.cpp
index 92b46d50..4a023e50 100644
--- a/tests/integration/tables/ad_config.cpp
+++ b/tests/integration/tables/ad_config.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(adConfig, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"domain", NormalType}
   //      {"option", NormalType}
diff --git a/tests/integration/tables/alf.cpp b/tests/integration/tables/alf.cpp
index f5f26c19..13b5f691 100644
--- a/tests/integration/tables/alf.cpp
+++ b/tests/integration/tables/alf.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(alf, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"allow_signed_enabled", IntType}
   //      {"firewall_unload", IntType}
   //      {"global_state", IntType}
diff --git a/tests/integration/tables/alf_exceptions.cpp b/tests/integration/tables/alf_exceptions.cpp
index 0a05e7fe..ec756bf3 100644
--- a/tests/integration/tables/alf_exceptions.cpp
+++ b/tests/integration/tables/alf_exceptions.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(alfExceptions, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"state", IntType}
   //}
diff --git a/tests/integration/tables/alf_explicit_auths.cpp b/tests/integration/tables/alf_explicit_auths.cpp
index 53a13c08..06d5650d 100644
--- a/tests/integration/tables/alf_explicit_auths.cpp
+++ b/tests/integration/tables/alf_explicit_auths.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(alfExplicitAuths, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"process", NormalType}
   //}
   // 4. Perform validation
diff --git a/tests/integration/tables/alf_services.cpp b/tests/integration/tables/alf_services.cpp
index 9fd3e70c..18d8709a 100644
--- a/tests/integration/tables/alf_services.cpp
+++ b/tests/integration/tables/alf_services.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(alfServices, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"service", NormalType}
   //      {"process", NormalType}
   //      {"state", IntType}
diff --git a/tests/integration/tables/app_schemes.cpp b/tests/integration/tables/app_schemes.cpp
index 053cf445..154d3319 100644
--- a/tests/integration/tables/app_schemes.cpp
+++ b/tests/integration/tables/app_schemes.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(appSchemes, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"scheme", NormalType}
   //      {"handler", NormalType}
   //      {"enabled", IntType}
diff --git a/tests/integration/tables/appcompat_shims.cpp b/tests/integration/tables/appcompat_shims.cpp
index 0cf225a7..078e2d7f 100644
--- a/tests/integration/tables/appcompat_shims.cpp
+++ b/tests/integration/tables/appcompat_shims.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(appcompatShims, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"executable", NormalType}
   //      {"path", NormalType}
   //      {"description", NormalType}
diff --git a/tests/integration/tables/apps.cpp b/tests/integration/tables/apps.cpp
index d8c8fc21..b70801b7 100644
--- a/tests/integration/tables/apps.cpp
+++ b/tests/integration/tables/apps.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(apps, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"path", NormalType}
   //      {"bundle_executable", NormalType}
diff --git a/tests/integration/tables/apt_sources.cpp b/tests/integration/tables/apt_sources.cpp
index 9ffd3d70..49b549fd 100644
--- a/tests/integration/tables/apt_sources.cpp
+++ b/tests/integration/tables/apt_sources.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -30,7 +29,7 @@ TEST_F(AptSourcesTest, test_sanity) {
     LOG(WARNING) << "select from \"apt_sources\" table returned no results and "
                     "therefore won't be tested";
   } else {
-    auto const row_map = ValidatatioMap{
+    auto const row_map = ValidationMap{
         {"name", NonEmptyString},
         {"source", FileOnDisk},
         {"base_uri", NonEmptyString},
diff --git a/tests/integration/tables/arp_cache.cpp b/tests/integration/tables/arp_cache.cpp
index 96051b1e..a1e62451 100644
--- a/tests/integration/tables/arp_cache.cpp
+++ b/tests/integration/tables/arp_cache.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -25,7 +24,7 @@ class ArpCacheTest : public testing::Test {
 TEST_F(ArpCacheTest, test_sanity) {
   QueryData data = execute_query("select * from arp_cache");
 
-  auto const row_map = ValidatatioMap{
+  auto const row_map = ValidationMap{
       {"address", verifyIpAddress},
       {"mac", verifyMacAddress},
       {"interface", NonEmptyString},
diff --git a/tests/integration/tables/asl.cpp b/tests/integration/tables/asl.cpp
index dcc4b8de..3b9197a9 100644
--- a/tests/integration/tables/asl.cpp
+++ b/tests/integration/tables/asl.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(asl, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"time", IntType}
   //      {"time_nano_sec", IntType}
   //      {"host", NormalType}
diff --git a/tests/integration/tables/atom_packages.cpp b/tests/integration/tables/atom_packages.cpp
index a7885c67..87fb1338 100644
--- a/tests/integration/tables/atom_packages.cpp
+++ b/tests/integration/tables/atom_packages.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -24,7 +23,7 @@ class atomPackages : public testing::Test {
 
 TEST_F(atomPackages, test_sanity) {
   auto const data = execute_query("select * from atom_packages");
-  ValidatatioMap row_map = {
+  ValidationMap row_map = {
       {"name", NormalType},
       {"version", NormalType},
       {"description", NormalType},
diff --git a/tests/integration/tables/augeas.cpp b/tests/integration/tables/augeas.cpp
index 1e9f6acd..598d860b 100644
--- a/tests/integration/tables/augeas.cpp
+++ b/tests/integration/tables/augeas.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(augeas, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"node", NormalType}
   //      {"value", NormalType}
   //      {"label", NormalType}
diff --git a/tests/integration/tables/authenticode.cpp b/tests/integration/tables/authenticode.cpp
index 1420c813..2351aef5 100644
--- a/tests/integration/tables/authenticode.cpp
+++ b/tests/integration/tables/authenticode.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(authenticode, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"original_program_name", NormalType}
   //      {"serial_number", NormalType}
diff --git a/tests/integration/tables/authorization_mechanisms.cpp b/tests/integration/tables/authorization_mechanisms.cpp
index 475ce91f..2727de4e 100644
--- a/tests/integration/tables/authorization_mechanisms.cpp
+++ b/tests/integration/tables/authorization_mechanisms.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(authorizationMechanisms, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"label", NormalType}
   //      {"plugin", NormalType}
   //      {"mechanism", NormalType}
diff --git a/tests/integration/tables/authorizations.cpp b/tests/integration/tables/authorizations.cpp
index 5d28f0bb..2f8411e8 100644
--- a/tests/integration/tables/authorizations.cpp
+++ b/tests/integration/tables/authorizations.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(authorizations, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"label", NormalType}
   //      {"modified", NormalType}
   //      {"allow_root", NormalType}
diff --git a/tests/integration/tables/authorized_keys.cpp b/tests/integration/tables/authorized_keys.cpp
index 4dc04384..f7fdb5bc 100644
--- a/tests/integration/tables/authorized_keys.cpp
+++ b/tests/integration/tables/authorized_keys.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(authorizedKeys, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"uid", IntType}
   //      {"algorithm", NormalType}
   //      {"key", NormalType}
diff --git a/tests/integration/tables/autoexec.cpp b/tests/integration/tables/autoexec.cpp
index a959d08f..7f3a507f 100644
--- a/tests/integration/tables/autoexec.cpp
+++ b/tests/integration/tables/autoexec.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(autoexec, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"name", NormalType}
   //      {"source", NormalType}
diff --git a/tests/integration/tables/battery.cpp b/tests/integration/tables/battery.cpp
index 877eacbb..41657615 100644
--- a/tests/integration/tables/battery.cpp
+++ b/tests/integration/tables/battery.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(battery, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"manufacturer", NormalType}
   //      {"manufacture_date", IntType}
   //      {"model", NormalType}
diff --git a/tests/integration/tables/bitlocker_info.cpp b/tests/integration/tables/bitlocker_info.cpp
index e3b55d04..439db7bb 100644
--- a/tests/integration/tables/bitlocker_info.cpp
+++ b/tests/integration/tables/bitlocker_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(bitlockerInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"device_id", NormalType}
   //      {"drive_letter", NormalType}
   //      {"persistent_volume_id", NormalType}
diff --git a/tests/integration/tables/block_devices.cpp b/tests/integration/tables/block_devices.cpp
index 8955334d..38563b69 100644
--- a/tests/integration/tables/block_devices.cpp
+++ b/tests/integration/tables/block_devices.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(blockDevices, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"parent", NormalType}
   //      {"vendor", NormalType}
diff --git a/tests/integration/tables/browser_plugins.cpp b/tests/integration/tables/browser_plugins.cpp
index a17cdf31..688d0697 100644
--- a/tests/integration/tables/browser_plugins.cpp
+++ b/tests/integration/tables/browser_plugins.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(browserPlugins, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"uid", IntType}
   //      {"name", NormalType}
   //      {"identifier", NormalType}
diff --git a/tests/integration/tables/carbon_black_info.cpp b/tests/integration/tables/carbon_black_info.cpp
index 624d505e..22502496 100644
--- a/tests/integration/tables/carbon_black_info.cpp
+++ b/tests/integration/tables/carbon_black_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(carbonBlackInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"sensor_id", IntType}
   //      {"config_name", NormalType}
   //      {"collect_store_files", IntType}
diff --git a/tests/integration/tables/carves.cpp b/tests/integration/tables/carves.cpp
index 87a7a107..22828ee8 100644
--- a/tests/integration/tables/carves.cpp
+++ b/tests/integration/tables/carves.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(carves, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"time", IntType}
   //      {"sha256", NormalType}
   //      {"size", IntType}
diff --git a/tests/integration/tables/certificates.cpp b/tests/integration/tables/certificates.cpp
index 92a8b0ff..19ef978e 100644
--- a/tests/integration/tables/certificates.cpp
+++ b/tests/integration/tables/certificates.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(certificates, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"common_name", NormalType}
   //      {"subject", NormalType}
   //      {"issuer", NormalType}
diff --git a/tests/integration/tables/chocolatey_packages.cpp b/tests/integration/tables/chocolatey_packages.cpp
index dde66cac..ae34bd40 100644
--- a/tests/integration/tables/chocolatey_packages.cpp
+++ b/tests/integration/tables/chocolatey_packages.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(chocolateyPackages, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"version", NormalType}
   //      {"summary", NormalType}
diff --git a/tests/integration/tables/chrome_extensions.cpp b/tests/integration/tables/chrome_extensions.cpp
index 48523dc4..3f1fdbec 100644
--- a/tests/integration/tables/chrome_extensions.cpp
+++ b/tests/integration/tables/chrome_extensions.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(chromeExtensions, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"uid", IntType}
   //      {"name", NormalType}
   //      {"identifier", NormalType}
diff --git a/tests/integration/tables/cpu_info.cpp b/tests/integration/tables/cpu_info.cpp
index 468a7c9c..4e000894 100644
--- a/tests/integration/tables/cpu_info.cpp
+++ b/tests/integration/tables/cpu_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -25,18 +24,18 @@ class cpuInfo : public testing::Test {
 TEST_F(cpuInfo, test_sanity) {
   const QueryData data = execute_query("select * from cpu_info");
   ASSERT_EQ(data.size(), 1ul);
-  ValidatatioMap row_map = {{"device_id", NormalType},
-                            {"model", NormalType},
-                            {"manufacturer", NormalType},
-                            {"processor_type", NonNegativeOrErrorInt},
-                            {"availability", NonNegativeOrErrorInt},
-                            {"cpu_status", NonNegativeOrErrorInt},
-                            {"number_of_cores", NonNegativeOrErrorInt},
-                            {"logical_processors", NonNegativeOrErrorInt},
-                            {"address_width", NonNegativeOrErrorInt},
-                            {"current_clock_speed", NonNegativeOrErrorInt},
-                            {"max_clock_speed", NonNegativeOrErrorInt},
-                            {"socket_designation", NormalType}};
+  ValidationMap row_map = {{"device_id", NormalType},
+                           {"model", NormalType},
+                           {"manufacturer", NormalType},
+                           {"processor_type", NonNegativeOrErrorInt},
+                           {"availability", NonNegativeOrErrorInt},
+                           {"cpu_status", NonNegativeOrErrorInt},
+                           {"number_of_cores", NonNegativeOrErrorInt},
+                           {"logical_processors", NonNegativeOrErrorInt},
+                           {"address_width", NonNegativeOrErrorInt},
+                           {"current_clock_speed", NonNegativeOrErrorInt},
+                           {"max_clock_speed", NonNegativeOrErrorInt},
+                           {"socket_designation", NormalType}};
   validate_rows(data, row_map);
 }
 
diff --git a/tests/integration/tables/cpu_time.cpp b/tests/integration/tables/cpu_time.cpp
index c10d3696..16bb8ec2 100644
--- a/tests/integration/tables/cpu_time.cpp
+++ b/tests/integration/tables/cpu_time.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(cpuTime, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"core", IntType}
   //      {"user", IntType}
   //      {"nice", IntType}
diff --git a/tests/integration/tables/cpuid.cpp b/tests/integration/tables/cpuid.cpp
index eb6f2cf8..3b6cad95 100644
--- a/tests/integration/tables/cpuid.cpp
+++ b/tests/integration/tables/cpuid.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(cpuid, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"feature", NormalType}
   //      {"value", NormalType}
   //      {"output_register", NormalType}
diff --git a/tests/integration/tables/crashes.cpp b/tests/integration/tables/crashes.cpp
index f015e1e3..2a03062d 100644
--- a/tests/integration/tables/crashes.cpp
+++ b/tests/integration/tables/crashes.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(crashes, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"type", NormalType}
   //      {"pid", IntType}
   //      {"path", NormalType}
diff --git a/tests/integration/tables/crontab.cpp b/tests/integration/tables/crontab.cpp
index 3738c8f4..216abec4 100644
--- a/tests/integration/tables/crontab.cpp
+++ b/tests/integration/tables/crontab.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -38,22 +37,22 @@ TEST_F(Crontab, test_sanity) {
                                                 "dec"};
   std::unordered_set<std::string> days_list = {
       "mon", "tue", "wed", "thu", "fri", "sat", "sun"};
-  ValidatatioMap row_map = {{"event",
-                             SpecificValuesCheck{"",
-                                                 "@reboot",
-                                                 "@hourly",
-                                                 "@daily",
-                                                 "@weekly",
-                                                 "@monthly",
-                                                 "@annually",
-                                                 "@yearly"}},
-                            {"minute", CronValuesCheck(0, 59)},
-                            {"hour", CronValuesCheck(0, 23)},
-                            {"day_of_month", CronValuesCheck(1, 31)},
-                            {"month", CronValuesCheck(1, 31, month_list)},
-                            {"day_of_week", CronValuesCheck(0, 7, days_list)},
-                            {"command", NonEmptyString},
-                            {"path", FileOnDisk}};
+  ValidationMap row_map = {{"event",
+                            SpecificValuesCheck{"",
+                                                "@reboot",
+                                                "@hourly",
+                                                "@daily",
+                                                "@weekly",
+                                                "@monthly",
+                                                "@annually",
+                                                "@yearly"}},
+                           {"minute", CronValuesCheck(0, 59)},
+                           {"hour", CronValuesCheck(0, 23)},
+                           {"day_of_month", CronValuesCheck(1, 31)},
+                           {"month", CronValuesCheck(1, 31, month_list)},
+                           {"day_of_week", CronValuesCheck(0, 7, days_list)},
+                           {"command", NonEmptyString},
+                           {"path", FileOnDisk}};
   validate_rows(data, row_map);
 }
 
diff --git a/tests/integration/tables/cups_destinations.cpp b/tests/integration/tables/cups_destinations.cpp
index 7a329ab2..4508807b 100644
--- a/tests/integration/tables/cups_destinations.cpp
+++ b/tests/integration/tables/cups_destinations.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(cupsDestinations, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"option_name", NormalType}
   //      {"option_value", NormalType}
diff --git a/tests/integration/tables/cups_jobs.cpp b/tests/integration/tables/cups_jobs.cpp
index 2aa51e07..93c85258 100644
--- a/tests/integration/tables/cups_jobs.cpp
+++ b/tests/integration/tables/cups_jobs.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(cupsJobs, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"title", NormalType}
   //      {"destination", NormalType}
   //      {"user", NormalType}
diff --git a/tests/integration/tables/curl.cpp b/tests/integration/tables/curl.cpp
index d2c5cbfd..47f66211 100644
--- a/tests/integration/tables/curl.cpp
+++ b/tests/integration/tables/curl.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(curl, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"url", NormalType}
   //      {"method", NormalType}
   //      {"user_agent", NormalType}
diff --git a/tests/integration/tables/curl_certificate.cpp b/tests/integration/tables/curl_certificate.cpp
index e14a6148..3dda3175 100644
--- a/tests/integration/tables/curl_certificate.cpp
+++ b/tests/integration/tables/curl_certificate.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -33,7 +32,7 @@ TEST_F(curlCertificate, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"hostname", NormalType}
   //      {"common_name", NormalType}
   //      {"organization", NormalType}
diff --git a/tests/integration/tables/deb_packages.cpp b/tests/integration/tables/deb_packages.cpp
index bc0c8d17..784229a6 100644
--- a/tests/integration/tables/deb_packages.cpp
+++ b/tests/integration/tables/deb_packages.cpp
@@ -26,7 +26,7 @@ class DebPackages : public testing::Test {
 TEST_F(DebPackages, test_sanity) {
   QueryData rows = execute_query("select * from deb_packages");
   if (rows.size() > 0) {
-    ValidatatioMap row_map = {
+    ValidationMap row_map = {
         {"name", NonEmptyString},
         {"version", NonEmptyString},
         {"source", NormalType},
diff --git a/tests/integration/tables/device_file.cpp b/tests/integration/tables/device_file.cpp
index 18a2be7c..45b1b72b 100644
--- a/tests/integration/tables/device_file.cpp
+++ b/tests/integration/tables/device_file.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -33,7 +32,7 @@ TEST_F(deviceFile, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"device", NormalType}
   //      {"partition", NormalType}
   //      {"path", NormalType}
diff --git a/tests/integration/tables/device_firmware.cpp b/tests/integration/tables/device_firmware.cpp
index 7ddd5feb..968e7d7f 100644
--- a/tests/integration/tables/device_firmware.cpp
+++ b/tests/integration/tables/device_firmware.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(deviceFirmware, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"type", NormalType}
   //      {"device", NormalType}
   //      {"version", NormalType}
diff --git a/tests/integration/tables/device_hash.cpp b/tests/integration/tables/device_hash.cpp
index 4a3e6fa3..754fc7be 100644
--- a/tests/integration/tables/device_hash.cpp
+++ b/tests/integration/tables/device_hash.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -34,7 +33,7 @@ TEST_F(deviceHash, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"device", NormalType}
   //      {"partition", NormalType}
   //      {"inode", IntType}
diff --git a/tests/integration/tables/device_partitions.cpp b/tests/integration/tables/device_partitions.cpp
index 8841548d..cc2a8e7b 100644
--- a/tests/integration/tables/device_partitions.cpp
+++ b/tests/integration/tables/device_partitions.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -33,7 +32,7 @@ TEST_F(devicePartitions, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"device", NormalType}
   //      {"partition", IntType}
   //      {"label", NormalType}
diff --git a/tests/integration/tables/disk_encryption.cpp b/tests/integration/tables/disk_encryption.cpp
index 597fe674..646d6607 100644
--- a/tests/integration/tables/disk_encryption.cpp
+++ b/tests/integration/tables/disk_encryption.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(diskEncryption, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"uuid", NormalType}
   //      {"encrypted", IntType}
diff --git a/tests/integration/tables/disk_events.cpp b/tests/integration/tables/disk_events.cpp
index 0603adff..0dc95624 100644
--- a/tests/integration/tables/disk_events.cpp
+++ b/tests/integration/tables/disk_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(diskEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"action", NormalType}
   //      {"path", NormalType}
   //      {"name", NormalType}
diff --git a/tests/integration/tables/disk_info.cpp b/tests/integration/tables/disk_info.cpp
index 248e5773..eff4300e 100644
--- a/tests/integration/tables/disk_info.cpp
+++ b/tests/integration/tables/disk_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(diskInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"partitions", IntType}
   //      {"disk_index", IntType}
   //      {"type", NormalType}
diff --git a/tests/integration/tables/dns_resolvers.cpp b/tests/integration/tables/dns_resolvers.cpp
index 8a28107b..8462cb5b 100644
--- a/tests/integration/tables/dns_resolvers.cpp
+++ b/tests/integration/tables/dns_resolvers.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dnsResolvers, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"id", IntType}
   //      {"type", NormalType}
   //      {"address", NormalType}
diff --git a/tests/integration/tables/docker_container_labels.cpp b/tests/integration/tables/docker_container_labels.cpp
index 10359264..695d50f2 100644
--- a/tests/integration/tables/docker_container_labels.cpp
+++ b/tests/integration/tables/docker_container_labels.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dockerContainerLabels, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"id", NormalType}
   //      {"key", NormalType}
   //      {"value", NormalType}
diff --git a/tests/integration/tables/docker_container_mounts.cpp b/tests/integration/tables/docker_container_mounts.cpp
index 14342a8b..59a6ff41 100644
--- a/tests/integration/tables/docker_container_mounts.cpp
+++ b/tests/integration/tables/docker_container_mounts.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dockerContainerMounts, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"id", NormalType}
   //      {"type", NormalType}
   //      {"name", NormalType}
diff --git a/tests/integration/tables/docker_container_networks.cpp b/tests/integration/tables/docker_container_networks.cpp
index efe987f3..a9f64a82 100644
--- a/tests/integration/tables/docker_container_networks.cpp
+++ b/tests/integration/tables/docker_container_networks.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dockerContainerNetworks, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"id", NormalType}
   //      {"name", NormalType}
   //      {"network_id", NormalType}
diff --git a/tests/integration/tables/docker_container_ports.cpp b/tests/integration/tables/docker_container_ports.cpp
index ba28ca6a..a464452a 100644
--- a/tests/integration/tables/docker_container_ports.cpp
+++ b/tests/integration/tables/docker_container_ports.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dockerContainerPorts, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"id", NormalType}
   //      {"type", NormalType}
   //      {"port", IntType}
diff --git a/tests/integration/tables/docker_container_processes.cpp b/tests/integration/tables/docker_container_processes.cpp
index c921da44..7141bfc3 100644
--- a/tests/integration/tables/docker_container_processes.cpp
+++ b/tests/integration/tables/docker_container_processes.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -33,7 +32,7 @@ TEST_F(dockerContainerProcesses, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"id", NormalType}
   //      {"pid", IntType}
   //      {"name", NormalType}
diff --git a/tests/integration/tables/docker_container_stats.cpp b/tests/integration/tables/docker_container_stats.cpp
index 45e4e7e0..1eefa872 100644
--- a/tests/integration/tables/docker_container_stats.cpp
+++ b/tests/integration/tables/docker_container_stats.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -33,7 +32,7 @@ TEST_F(dockerContainerStats, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"id", NormalType}
   //      {"name", NormalType}
   //      {"pids", IntType}
diff --git a/tests/integration/tables/docker_containers.cpp b/tests/integration/tables/docker_containers.cpp
index 54b962bb..4846dfee 100644
--- a/tests/integration/tables/docker_containers.cpp
+++ b/tests/integration/tables/docker_containers.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dockerContainers, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"id", NormalType}
   //      {"name", NormalType}
   //      {"image", NormalType}
diff --git a/tests/integration/tables/docker_image_labels.cpp b/tests/integration/tables/docker_image_labels.cpp
index ef0ce591..740cd556 100644
--- a/tests/integration/tables/docker_image_labels.cpp
+++ b/tests/integration/tables/docker_image_labels.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dockerImageLabels, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"id", NormalType}
   //      {"key", NormalType}
   //      {"value", NormalType}
diff --git a/tests/integration/tables/docker_images.cpp b/tests/integration/tables/docker_images.cpp
index aa3247a2..31a735d9 100644
--- a/tests/integration/tables/docker_images.cpp
+++ b/tests/integration/tables/docker_images.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dockerImages, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"id", NormalType}
   //      {"created", IntType}
   //      {"size_bytes", IntType}
diff --git a/tests/integration/tables/docker_info.cpp b/tests/integration/tables/docker_info.cpp
index d44b3441..fbfa61b6 100644
--- a/tests/integration/tables/docker_info.cpp
+++ b/tests/integration/tables/docker_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dockerInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"id", NormalType}
   //      {"containers", IntType}
   //      {"containers_running", IntType}
diff --git a/tests/integration/tables/docker_network_labels.cpp b/tests/integration/tables/docker_network_labels.cpp
index e5b7036f..6727d715 100644
--- a/tests/integration/tables/docker_network_labels.cpp
+++ b/tests/integration/tables/docker_network_labels.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dockerNetworkLabels, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"id", NormalType}
   //      {"key", NormalType}
   //      {"value", NormalType}
diff --git a/tests/integration/tables/docker_networks.cpp b/tests/integration/tables/docker_networks.cpp
index 28bdccfd..df2732c4 100644
--- a/tests/integration/tables/docker_networks.cpp
+++ b/tests/integration/tables/docker_networks.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dockerNetworks, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"id", NormalType}
   //      {"name", NormalType}
   //      {"driver", NormalType}
diff --git a/tests/integration/tables/docker_version.cpp b/tests/integration/tables/docker_version.cpp
index 60b78781..6c633dea 100644
--- a/tests/integration/tables/docker_version.cpp
+++ b/tests/integration/tables/docker_version.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dockerVersion, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"version", NormalType}
   //      {"api_version", NormalType}
   //      {"min_api_version", NormalType}
diff --git a/tests/integration/tables/docker_volume_labels.cpp b/tests/integration/tables/docker_volume_labels.cpp
index 28c8b397..1737671a 100644
--- a/tests/integration/tables/docker_volume_labels.cpp
+++ b/tests/integration/tables/docker_volume_labels.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dockerVolumeLabels, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"key", NormalType}
   //      {"value", NormalType}
diff --git a/tests/integration/tables/docker_volumes.cpp b/tests/integration/tables/docker_volumes.cpp
index dff71e2b..72552180 100644
--- a/tests/integration/tables/docker_volumes.cpp
+++ b/tests/integration/tables/docker_volumes.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(dockerVolumes, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"driver", NormalType}
   //      {"mount_point", NormalType}
diff --git a/tests/integration/tables/drivers.cpp b/tests/integration/tables/drivers.cpp
index 4d5190f5..c433b0d3 100644
--- a/tests/integration/tables/drivers.cpp
+++ b/tests/integration/tables/drivers.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(drivers, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"device_id", NormalType}
   //      {"device_name", NormalType}
   //      {"image", NormalType}
diff --git a/tests/integration/tables/ec2_instance_metadata.cpp b/tests/integration/tables/ec2_instance_metadata.cpp
index e65b346d..cb2ee567 100644
--- a/tests/integration/tables/ec2_instance_metadata.cpp
+++ b/tests/integration/tables/ec2_instance_metadata.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(ec2InstanceMetadata, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"instance_id", NormalType}
   //      {"instance_type", NormalType}
   //      {"architecture", NormalType}
diff --git a/tests/integration/tables/ec2_instance_tags.cpp b/tests/integration/tables/ec2_instance_tags.cpp
index fd28ac44..35e47de4 100644
--- a/tests/integration/tables/ec2_instance_tags.cpp
+++ b/tests/integration/tables/ec2_instance_tags.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(ec2InstanceTags, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"instance_id", NormalType}
   //      {"key", NormalType}
   //      {"value", NormalType}
diff --git a/tests/integration/tables/elf_dynamic.cpp b/tests/integration/tables/elf_dynamic.cpp
index 9a6280da..22f10d2f 100644
--- a/tests/integration/tables/elf_dynamic.cpp
+++ b/tests/integration/tables/elf_dynamic.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(elfDynamic, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"tag", IntType}
   //      {"value", IntType}
   //      {"class", IntType}
diff --git a/tests/integration/tables/elf_info.cpp b/tests/integration/tables/elf_info.cpp
index 4ec0d93d..64a801ec 100644
--- a/tests/integration/tables/elf_info.cpp
+++ b/tests/integration/tables/elf_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(elfInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"class", NormalType}
   //      {"abi", NormalType}
   //      {"abi_version", IntType}
diff --git a/tests/integration/tables/elf_sections.cpp b/tests/integration/tables/elf_sections.cpp
index 5f16ff15..e84ae908 100644
--- a/tests/integration/tables/elf_sections.cpp
+++ b/tests/integration/tables/elf_sections.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(elfSections, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"type", IntType}
   //      {"vaddr", IntType}
diff --git a/tests/integration/tables/elf_segments.cpp b/tests/integration/tables/elf_segments.cpp
index d91ab297..b521fbec 100644
--- a/tests/integration/tables/elf_segments.cpp
+++ b/tests/integration/tables/elf_segments.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(elfSegments, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"offset", IntType}
   //      {"vaddr", IntType}
diff --git a/tests/integration/tables/elf_symbols.cpp b/tests/integration/tables/elf_symbols.cpp
index 52a44b89..c4e4fccd 100644
--- a/tests/integration/tables/elf_symbols.cpp
+++ b/tests/integration/tables/elf_symbols.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(elfSymbols, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"addr", IntType}
   //      {"size", IntType}
diff --git a/tests/integration/tables/etc_hosts.cpp b/tests/integration/tables/etc_hosts.cpp
index 129ada1c..2d692475 100644
--- a/tests/integration/tables/etc_hosts.cpp
+++ b/tests/integration/tables/etc_hosts.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(etcHosts, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"address", NormalType}
   //      {"hostnames", NormalType}
   //}
diff --git a/tests/integration/tables/etc_protocols.cpp b/tests/integration/tables/etc_protocols.cpp
index 74b7a803..f9316bf8 100644
--- a/tests/integration/tables/etc_protocols.cpp
+++ b/tests/integration/tables/etc_protocols.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -24,7 +23,7 @@ class EtcProtocolsTest : public testing::Test {
 
 TEST_F(EtcProtocolsTest, test_sanity) {
   auto const rows = execute_query("select * from etc_protocols");
-  auto const row_map = ValidatatioMap{
+  auto const row_map = ValidationMap{
       {"name", NonEmptyString},
       {"number", NonNegativeInt},
       {"alias", NonEmptyString},
diff --git a/tests/integration/tables/etc_services.cpp b/tests/integration/tables/etc_services.cpp
index 9f8e275e..dbd83f49 100644
--- a/tests/integration/tables/etc_services.cpp
+++ b/tests/integration/tables/etc_services.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(etcServices, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"port", IntType}
   //      {"protocol", NormalType}
diff --git a/tests/integration/tables/event_taps.cpp b/tests/integration/tables/event_taps.cpp
index 2f36a0f9..a5344cf3 100644
--- a/tests/integration/tables/event_taps.cpp
+++ b/tests/integration/tables/event_taps.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(eventTaps, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"enabled", IntType}
   //      {"event_tap_id", IntType}
   //      {"event_tapped", NormalType}
diff --git a/tests/integration/tables/example.cpp b/tests/integration/tables/example.cpp
index a34068bf..80c48bf9 100644
--- a/tests/integration/tables/example.cpp
+++ b/tests/integration/tables/example.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(example, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"points", IntType}
   //      {"size", IntType}
diff --git a/tests/integration/tables/extended_attributes.cpp b/tests/integration/tables/extended_attributes.cpp
index 14d3e342..271a9026 100644
--- a/tests/integration/tables/extended_attributes.cpp
+++ b/tests/integration/tables/extended_attributes.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -33,7 +32,7 @@ TEST_F(extendedAttributes, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"directory", NormalType}
   //      {"key", NormalType}
diff --git a/tests/integration/tables/fan_speed_sensors.cpp b/tests/integration/tables/fan_speed_sensors.cpp
index 2c8366c6..1e3737b9 100644
--- a/tests/integration/tables/fan_speed_sensors.cpp
+++ b/tests/integration/tables/fan_speed_sensors.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(fanSpeedSensors, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"fan", NormalType}
   //      {"name", NormalType}
   //      {"actual", IntType}
diff --git a/tests/integration/tables/fbsd_kmods.cpp b/tests/integration/tables/fbsd_kmods.cpp
index bb7ad9d4..e2365a34 100644
--- a/tests/integration/tables/fbsd_kmods.cpp
+++ b/tests/integration/tables/fbsd_kmods.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(fbsdKmods, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"size", IntType}
   //      {"refs", IntType}
diff --git a/tests/integration/tables/file.cpp b/tests/integration/tables/file.cpp
index 8812a2a0..57bebe2b 100644
--- a/tests/integration/tables/file.cpp
+++ b/tests/integration/tables/file.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -49,23 +48,23 @@ TEST_F(FileTests, test_sanity) {
       "\"");
   EXPECT_EQ(data.size(), 1ul);
 
-  ValidatatioMap row_map = {{"path", FileOnDisk},
-                            {"directory", DirectoryOnDisk},
-                            {"filename", NonEmptyString},
-                            {"inode", IntType},
-                            {"uid", NonNegativeInt},
-                            {"gid", NonNegativeInt},
-                            {"mode", NormalType},
-                            {"device", IntType},
-                            {"size", NonNegativeInt},
-                            {"block_size", NonNegativeInt},
-                            {"atime", NonNegativeInt},
-                            {"mtime", NonNegativeInt},
-                            {"ctime", NonNegativeInt},
-                            {"btime", NonNegativeInt},
-                            {"hard_links", IntType},
-                            {"symlink", IntType},
-                            {"type", NonEmptyString}};
+  ValidationMap row_map = {{"path", FileOnDisk},
+                           {"directory", DirectoryOnDisk},
+                           {"filename", NonEmptyString},
+                           {"inode", IntType},
+                           {"uid", NonNegativeInt},
+                           {"gid", NonNegativeInt},
+                           {"mode", NormalType},
+                           {"device", IntType},
+                           {"size", NonNegativeInt},
+                           {"block_size", NonNegativeInt},
+                           {"atime", NonNegativeInt},
+                           {"mtime", NonNegativeInt},
+                           {"ctime", NonNegativeInt},
+                           {"btime", NonNegativeInt},
+                           {"hard_links", IntType},
+                           {"symlink", IntType},
+                           {"type", NonEmptyString}};
 #ifdef WIN32
   row_map["attributes"] = NormalType;
   row_map["volume_serial"] = NormalType;
diff --git a/tests/integration/tables/file_events.cpp b/tests/integration/tables/file_events.cpp
index 92f77607..36c380ac 100644
--- a/tests/integration/tables/file_events.cpp
+++ b/tests/integration/tables/file_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(fileEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"target_path", NormalType}
   //      {"category", NormalType}
   //      {"action", NormalType}
diff --git a/tests/integration/tables/firefox_addons.cpp b/tests/integration/tables/firefox_addons.cpp
index 3b880575..6d5fa4d7 100644
--- a/tests/integration/tables/firefox_addons.cpp
+++ b/tests/integration/tables/firefox_addons.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(firefoxAddons, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"uid", IntType}
   //      {"name", NormalType}
   //      {"identifier", NormalType}
diff --git a/tests/integration/tables/gatekeeper.cpp b/tests/integration/tables/gatekeeper.cpp
index d1bc0625..29d38871 100644
--- a/tests/integration/tables/gatekeeper.cpp
+++ b/tests/integration/tables/gatekeeper.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(gatekeeper, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"assessments_enabled", IntType}
   //      {"dev_id_enabled", IntType}
   //      {"version", NormalType}
diff --git a/tests/integration/tables/gatekeeper_approved_apps.cpp b/tests/integration/tables/gatekeeper_approved_apps.cpp
index 93317e26..61a97c2a 100644
--- a/tests/integration/tables/gatekeeper_approved_apps.cpp
+++ b/tests/integration/tables/gatekeeper_approved_apps.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(gatekeeperApprovedApps, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"requirement", NormalType}
   //      {"ctime", NormalType}
diff --git a/tests/integration/tables/groups.cpp b/tests/integration/tables/groups.cpp
index c38c4ff7..40a7cc18 100644
--- a/tests/integration/tables/groups.cpp
+++ b/tests/integration/tables/groups.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(groups, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"gid", IntType}
   //      {"gid_signed", IntType}
   //      {"groupname", NormalType}
diff --git a/tests/integration/tables/hardware_events.cpp b/tests/integration/tables/hardware_events.cpp
index f2695de5..469e712b 100644
--- a/tests/integration/tables/hardware_events.cpp
+++ b/tests/integration/tables/hardware_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(hardwareEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"action", NormalType}
   //      {"path", NormalType}
   //      {"type", NormalType}
diff --git a/tests/integration/tables/hash.cpp b/tests/integration/tables/hash.cpp
index e3be4a11..2f3eece4 100644
--- a/tests/integration/tables/hash.cpp
+++ b/tests/integration/tables/hash.cpp
@@ -44,7 +44,7 @@ TEST_F(Hash, test_sanity) {
 
   ASSERT_EQ(data.size(), 1ul);
 
-  ValidatatioMap row_map = {
+  ValidationMap row_map = {
       {"path", NonEmptyString},
       {"directory", NonEmptyString},
       {"md5", NonEmptyString},
diff --git a/tests/integration/tables/helper.cpp b/tests/integration/tables/helper.cpp
index 329343ec..5dec091e 100644
--- a/tests/integration/tables/helper.cpp
+++ b/tests/integration/tables/helper.cpp
@@ -142,7 +142,7 @@ QueryData execute_query(std::string query) {
   return rows;
 }
 
-void validate_row(const Row& row, const ValidatatioMap& validation_map) {
+void validate_row(const Row& row, const ValidationMap& validation_map) {
   for (auto const& rec : row) {
     EXPECT_NE(validation_map.count(rec.first), std::size_t{0})
         << "Unexpected column " << boost::io::quoted(rec.first) << " in a row";
@@ -154,7 +154,7 @@ void validate_row(const Row& row, const ValidatatioMap& validation_map) {
         << "Could not find column " << boost::io::quoted(key)
         << " in the generated columns";
     std::string value = row_data_iter->second;
-    ValidatatioDataType validator = iter.second;
+    ValidationDataType validator = iter.second;
     if (validator.type() == typeid(int)) {
       int flags = boost::get<int>(validator);
       ASSERT_TRUE(validate_value_using_flags(value, flags))
@@ -168,7 +168,7 @@ void validate_row(const Row& row, const ValidatatioMap& validation_map) {
   }
 }
 void validate_rows(const std::vector<Row>& rows,
-                   const ValidatatioMap& validation_map) {
+                   const ValidationMap& validation_map) {
   for (auto row : rows) {
     validate_row(row, validation_map);
   }
diff --git a/tests/integration/tables/helper.h b/tests/integration/tables/helper.h
index 28feec29..3cef1e95 100644
--- a/tests/integration/tables/helper.h
+++ b/tests/integration/tables/helper.h
@@ -77,15 +77,14 @@ enum {
 };
 
 using CustomCheckerType = std::function<bool(const std::string&)>;
-using ValidatatioDataType = boost::variant<int, CustomCheckerType>;
-using ValidatatioMap = std::unordered_map<std::string, ValidatatioDataType>;
+using ValidationDataType = boost::variant<int, CustomCheckerType>;
+using ValidationMap = std::unordered_map<std::string, ValidationDataType>;
 
 QueryData execute_query(std::string query);
 
-void validate_row(const Row& row,
-                  const ValidatatioMap& validation_map);
+void validate_row(const Row& row, const ValidationMap& validation_map);
 void validate_rows(const std::vector<Row>& rows,
-                   const ValidatatioMap& validation_map);
+                   const ValidationMap& validation_map);
 bool validate_value_using_flags(const std::string& value, int flags);
 bool is_valid_hex(const std::string& value);
 
diff --git a/tests/integration/tables/homebrew_packages.cpp b/tests/integration/tables/homebrew_packages.cpp
index a21efa26..cd1f77c6 100644
--- a/tests/integration/tables/homebrew_packages.cpp
+++ b/tests/integration/tables/homebrew_packages.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(homebrewPackages, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"path", NormalType}
   //      {"version", NormalType}
diff --git a/tests/integration/tables/ibridge.cpp b/tests/integration/tables/ibridge.cpp
index e343ef27..5352599f 100644
--- a/tests/integration/tables/ibridge.cpp
+++ b/tests/integration/tables/ibridge.cpp
@@ -25,7 +25,7 @@ TEST_F(IBridgeTest, test_sanity) {
     VLOG(1) << "Empty result for table: ibridge, skipping test";
   } else {
     ASSERT_EQ(rows.size(), 1ul);
-    ValidatatioMap validation_map = {
+    ValidationMap validation_map = {
         {"boot_uuid", NormalType},
         {"coprocessor_version", NonEmptyString},
         {"firmware_version", NonEmptyString},
diff --git a/tests/integration/tables/ie_extensions.cpp b/tests/integration/tables/ie_extensions.cpp
index a14dfde8..6349c30b 100644
--- a/tests/integration/tables/ie_extensions.cpp
+++ b/tests/integration/tables/ie_extensions.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(ieExtensions, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"registry_path", NormalType}
   //      {"version", NormalType}
diff --git a/tests/integration/tables/intel_me_info.cpp b/tests/integration/tables/intel_me_info.cpp
index 6fedf9a9..1ecd6046 100644
--- a/tests/integration/tables/intel_me_info.cpp
+++ b/tests/integration/tables/intel_me_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(intelMeInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"version", NormalType}
   //}
   // 4. Perform validation
diff --git a/tests/integration/tables/interface_addresses.cpp b/tests/integration/tables/interface_addresses.cpp
index cf58e500..6f300563 100644
--- a/tests/integration/tables/interface_addresses.cpp
+++ b/tests/integration/tables/interface_addresses.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -27,7 +26,7 @@ class InterfaceAddressesTest : public testing::Test {
 TEST_F(InterfaceAddressesTest, test_sanity) {
   QueryData const rows = execute_query("select * from interface_addresses");
 
-  auto const row_map = ValidatatioMap{
+  auto const row_map = ValidationMap{
       {"interface", NonEmptyString},
       {"address", verifyIpAddress},
       {"mask", verifyIpAddress},
diff --git a/tests/integration/tables/interface_details.cpp b/tests/integration/tables/interface_details.cpp
index 72b00ba6..d3bd0d56 100644
--- a/tests/integration/tables/interface_details.cpp
+++ b/tests/integration/tables/interface_details.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -71,7 +70,7 @@ TEST_F(InterfaceDetailsTest, test_sanity) {
     return true;
   };
 #endif
-  auto const row_map = ValidatatioMap{
+  auto const row_map = ValidationMap{
       {"interface", NonEmptyString},
       {"mac", verify_non_empty_string_or_empty_on_win},
       {"type", NonNegativeInt},
diff --git a/tests/integration/tables/interface_ipv6.cpp b/tests/integration/tables/interface_ipv6.cpp
index b998022e..bf8b70c6 100644
--- a/tests/integration/tables/interface_ipv6.cpp
+++ b/tests/integration/tables/interface_ipv6.cpp
@@ -23,7 +23,7 @@ class InterfaceIpv6Test : public testing::Test {
 
 TEST_F(InterfaceIpv6Test, test_sanity) {
   QueryData const rows = execute_query("select * from interface_ipv6");
-  auto const row_map = ValidatatioMap{
+  auto const row_map = ValidationMap{
       {"interface", NonEmptyString},
       {"hop_limit", IntMinMaxCheck(0, 255)},
       {"forwarding_enabled", Bool},
diff --git a/tests/integration/tables/iokit_devicetree.cpp b/tests/integration/tables/iokit_devicetree.cpp
index 65f6c2d6..03c6e8ee 100644
--- a/tests/integration/tables/iokit_devicetree.cpp
+++ b/tests/integration/tables/iokit_devicetree.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(iokitDevicetree, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"class", NormalType}
   //      {"id", IntType}
diff --git a/tests/integration/tables/iokit_registry.cpp b/tests/integration/tables/iokit_registry.cpp
index 8735d61a..865f79be 100644
--- a/tests/integration/tables/iokit_registry.cpp
+++ b/tests/integration/tables/iokit_registry.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(iokitRegistry, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"class", NormalType}
   //      {"id", IntType}
diff --git a/tests/integration/tables/iptables.cpp b/tests/integration/tables/iptables.cpp
index 0e7dd735..35ab4656 100644
--- a/tests/integration/tables/iptables.cpp
+++ b/tests/integration/tables/iptables.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -27,24 +26,24 @@ TEST_F(iptables, test_sanity) {
 
   ASSERT_GE(data.size(), 0ul);
 
-  ValidatatioMap row_map = {{"filter_name", NonEmptyString},
-                            {"chain", NormalType},
-                            {"policy", NormalType},
-                            {"target", NormalType},
-                            {"protocol", IntType},
-                            {"src_port", IntMinMaxCheck(0, 65535)},
-                            {"dst_port", IntMinMaxCheck(0, 65535)},
-                            {"src_ip", verifyEmptyStringOrIpAddress},
-                            {"src_mask", verifyEmptyStringOrIpAddress},
-                            {"iniface", NormalType},
-                            {"iniface_mask", verifyEmptyStringOrIpAddress},
-                            {"dst_ip", verifyEmptyStringOrIpAddress},
-                            {"dst_mask", verifyEmptyStringOrIpAddress},
-                            {"outiface", NormalType},
-                            {"outiface_mask", verifyEmptyStringOrIpAddress},
-                            {"match", SpecificValuesCheck{"yes", "no"}},
-                            {"packets", NonNegativeInt},
-                            {"bytes", NonNegativeInt}};
+  ValidationMap row_map = {{"filter_name", NonEmptyString},
+                           {"chain", NormalType},
+                           {"policy", NormalType},
+                           {"target", NormalType},
+                           {"protocol", IntType},
+                           {"src_port", IntMinMaxCheck(0, 65535)},
+                           {"dst_port", IntMinMaxCheck(0, 65535)},
+                           {"src_ip", verifyEmptyStringOrIpAddress},
+                           {"src_mask", verifyEmptyStringOrIpAddress},
+                           {"iniface", NormalType},
+                           {"iniface_mask", verifyEmptyStringOrIpAddress},
+                           {"dst_ip", verifyEmptyStringOrIpAddress},
+                           {"dst_mask", verifyEmptyStringOrIpAddress},
+                           {"outiface", NormalType},
+                           {"outiface_mask", verifyEmptyStringOrIpAddress},
+                           {"match", SpecificValuesCheck{"yes", "no"}},
+                           {"packets", NonNegativeInt},
+                           {"bytes", NonNegativeInt}};
   validate_rows(data, row_map);
 }
 
diff --git a/tests/integration/tables/kernel_extensions.cpp b/tests/integration/tables/kernel_extensions.cpp
index 9cf974b4..1b5b89ce 100644
--- a/tests/integration/tables/kernel_extensions.cpp
+++ b/tests/integration/tables/kernel_extensions.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(kernelExtensions, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"idx", IntType}
   //      {"refs", IntType}
   //      {"size", IntType}
diff --git a/tests/integration/tables/kernel_info.cpp b/tests/integration/tables/kernel_info.cpp
index 6e593580..0b7a4081 100644
--- a/tests/integration/tables/kernel_info.cpp
+++ b/tests/integration/tables/kernel_info.cpp
@@ -23,10 +23,10 @@ class KernelInfo : public testing::Test {
 
 TEST_F(KernelInfo, test_sanity) {
   QueryData data = execute_query("select * from kernel_info");
-  ValidatatioMap row_map = {{"version", NonEmptyString},
-                            {"arguments", NormalType},
-                            {"path", NormalType},
-                            {"device", NonEmptyString}};
+  ValidationMap row_map = {{"version", NonEmptyString},
+                           {"arguments", NormalType},
+                           {"path", NormalType},
+                           {"device", NonEmptyString}};
   validate_rows(data, row_map);
 }
 
diff --git a/tests/integration/tables/kernel_integrity.cpp b/tests/integration/tables/kernel_integrity.cpp
index 76832ce3..13e4db4a 100644
--- a/tests/integration/tables/kernel_integrity.cpp
+++ b/tests/integration/tables/kernel_integrity.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(kernelIntegrity, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"sycall_addr_modified", IntType}
   //      {"text_segment_hash", NormalType}
   //}
diff --git a/tests/integration/tables/kernel_modules.cpp b/tests/integration/tables/kernel_modules.cpp
index 59e44250..a0950ea0 100644
--- a/tests/integration/tables/kernel_modules.cpp
+++ b/tests/integration/tables/kernel_modules.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -25,7 +24,7 @@ class KernelModules : public testing::Test {
 TEST_F(KernelModules, test_sanity) {
   QueryData data = execute_query("select * from kernel_modules");
   ASSERT_GT(data.size(), 0ul);
-  ValidatatioMap row_map = {
+  ValidationMap row_map = {
       {"name", NonEmptyString},
       {"size", NonNegativeInt},
       {"used_by", NonEmptyString},
diff --git a/tests/integration/tables/kernel_panics.cpp b/tests/integration/tables/kernel_panics.cpp
index 88748a4d..bb2b070d 100644
--- a/tests/integration/tables/kernel_panics.cpp
+++ b/tests/integration/tables/kernel_panics.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(kernelPanics, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"time", NormalType}
   //      {"registers", NormalType}
diff --git a/tests/integration/tables/keychain_acls.cpp b/tests/integration/tables/keychain_acls.cpp
index 8a2975ec..c318c346 100644
--- a/tests/integration/tables/keychain_acls.cpp
+++ b/tests/integration/tables/keychain_acls.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(keychainAcls, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"keychain_path", NormalType}
   //      {"authorizations", NormalType}
   //      {"path", NormalType}
diff --git a/tests/integration/tables/keychain_items.cpp b/tests/integration/tables/keychain_items.cpp
index 7a479bfd..f568f72a 100644
--- a/tests/integration/tables/keychain_items.cpp
+++ b/tests/integration/tables/keychain_items.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(keychainItems, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"label", NormalType}
   //      {"description", NormalType}
   //      {"comment", NormalType}
diff --git a/tests/integration/tables/known_hosts.cpp b/tests/integration/tables/known_hosts.cpp
index 8418dae9..a61adca9 100644
--- a/tests/integration/tables/known_hosts.cpp
+++ b/tests/integration/tables/known_hosts.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -30,7 +29,7 @@ TEST_F(KnownHostsTest, test_sanity) {
     LOG(WARNING) << "select from \"known_hosts\" table returned no results and "
                     "therefore won't be tested";
   } else {
-    auto const row_map = ValidatatioMap{
+    auto const row_map = ValidationMap{
         {"uid", IntType},
         {"key", NonEmptyString},
         {"key_file", FileOnDisk},
diff --git a/tests/integration/tables/kva_speculative_info.cpp b/tests/integration/tables/kva_speculative_info.cpp
index 14445208..717f2154 100644
--- a/tests/integration/tables/kva_speculative_info.cpp
+++ b/tests/integration/tables/kva_speculative_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(kvaSpeculativeInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"kva_shadow_enabled", IntType}
   //      {"kva_shadow_user_global", IntType}
   //      {"kva_shadow_pcid", IntType}
diff --git a/tests/integration/tables/last.cpp b/tests/integration/tables/last.cpp
index c752d660..de66fa93 100644
--- a/tests/integration/tables/last.cpp
+++ b/tests/integration/tables/last.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(last, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"username", NormalType}
   //      {"tty", NormalType}
   //      {"pid", IntType}
diff --git a/tests/integration/tables/launchd.cpp b/tests/integration/tables/launchd.cpp
index be61ad93..b7f10755 100644
--- a/tests/integration/tables/launchd.cpp
+++ b/tests/integration/tables/launchd.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(launchd, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"name", NormalType}
   //      {"label", NormalType}
diff --git a/tests/integration/tables/launchd_overrides.cpp b/tests/integration/tables/launchd_overrides.cpp
index 24610b31..7aadfafc 100644
--- a/tests/integration/tables/launchd_overrides.cpp
+++ b/tests/integration/tables/launchd_overrides.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(launchdOverrides, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"label", NormalType}
   //      {"key", NormalType}
   //      {"value", NormalType}
diff --git a/tests/integration/tables/listening_ports.cpp b/tests/integration/tables/listening_ports.cpp
index 315347aa..f807d4d5 100644
--- a/tests/integration/tables/listening_ports.cpp
+++ b/tests/integration/tables/listening_ports.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(listeningPorts, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"pid", IntType}
   //      {"port", IntType}
   //      {"protocol", IntType}
diff --git a/tests/integration/tables/lldp_neighbors.cpp b/tests/integration/tables/lldp_neighbors.cpp
index 152ebcc0..c0e9019a 100644
--- a/tests/integration/tables/lldp_neighbors.cpp
+++ b/tests/integration/tables/lldp_neighbors.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(lldpNeighbors, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"interface", NormalType}
   //      {"rid", IntType}
   //      {"chassis_id_type", NormalType}
diff --git a/tests/integration/tables/load_average.cpp b/tests/integration/tables/load_average.cpp
index 0fe7abca..c55a856d 100644
--- a/tests/integration/tables/load_average.cpp
+++ b/tests/integration/tables/load_average.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(loadAverage, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"period", NormalType}
   //      {"average", NormalType}
   //}
diff --git a/tests/integration/tables/logged_in_users.cpp b/tests/integration/tables/logged_in_users.cpp
index e725a4bb..61c87488 100644
--- a/tests/integration/tables/logged_in_users.cpp
+++ b/tests/integration/tables/logged_in_users.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -24,7 +23,7 @@ class LoggedInUsersTest : public testing::Test {
 
 TEST_F(LoggedInUsersTest, test_sanity) {
   auto const rows = execute_query("select * from logged_in_users");
-  auto const row_map = ValidatatioMap{
+  auto const row_map = ValidationMap{
       {"type", NonEmptyString},
       {"user", NormalType},
       {"tty", NormalType},
diff --git a/tests/integration/tables/logical_drives.cpp b/tests/integration/tables/logical_drives.cpp
index e71979ec..48b44233 100644
--- a/tests/integration/tables/logical_drives.cpp
+++ b/tests/integration/tables/logical_drives.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -26,7 +25,7 @@ TEST_F(logicalDrives, test_sanity) {
   auto const data = execute_query("select * from logical_drives");
   ASSERT_GE(data.size(), 1ul);
 
-  ValidatatioMap row_map = {
+  ValidationMap row_map = {
       {"device_id", NormalType},
       {"type", NormalType},
       {"description", NormalType},
diff --git a/tests/integration/tables/logon_sessions.cpp b/tests/integration/tables/logon_sessions.cpp
index 561d629c..1fa86650 100644
--- a/tests/integration/tables/logon_sessions.cpp
+++ b/tests/integration/tables/logon_sessions.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(logonSessions, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"logon_id", IntType}
   //      {"user", NormalType}
   //      {"logon_domain", NormalType}
diff --git a/tests/integration/tables/magic.cpp b/tests/integration/tables/magic.cpp
index 74b1adcd..33dea0e7 100644
--- a/tests/integration/tables/magic.cpp
+++ b/tests/integration/tables/magic.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(magic, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"data", NormalType}
   //      {"mime_type", NormalType}
diff --git a/tests/integration/tables/managed_policies.cpp b/tests/integration/tables/managed_policies.cpp
index 2cee997f..c185f986 100644
--- a/tests/integration/tables/managed_policies.cpp
+++ b/tests/integration/tables/managed_policies.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(managedPolicies, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"domain", NormalType}
   //      {"uuid", NormalType}
   //      {"name", NormalType}
diff --git a/tests/integration/tables/md_devices.cpp b/tests/integration/tables/md_devices.cpp
index ccfeb849..f58d07f7 100644
--- a/tests/integration/tables/md_devices.cpp
+++ b/tests/integration/tables/md_devices.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(mdDevices, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"device_name", NormalType}
   //      {"status", NormalType}
   //      {"raid_level", IntType}
diff --git a/tests/integration/tables/md_drives.cpp b/tests/integration/tables/md_drives.cpp
index 092a4e3d..80d41ca5 100644
--- a/tests/integration/tables/md_drives.cpp
+++ b/tests/integration/tables/md_drives.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(mdDrives, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"md_device_name", NormalType}
   //      {"drive_name", NormalType}
   //      {"slot", IntType}
diff --git a/tests/integration/tables/md_personalities.cpp b/tests/integration/tables/md_personalities.cpp
index ea978951..7566fee5 100644
--- a/tests/integration/tables/md_personalities.cpp
+++ b/tests/integration/tables/md_personalities.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(mdPersonalities, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //}
   // 4. Perform validation
diff --git a/tests/integration/tables/mdfind.cpp b/tests/integration/tables/mdfind.cpp
index d4855599..30f742c5 100644
--- a/tests/integration/tables/mdfind.cpp
+++ b/tests/integration/tables/mdfind.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(mdfind, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"query", NormalType}
   //}
diff --git a/tests/integration/tables/memory_array_mapped_addresses.cpp b/tests/integration/tables/memory_array_mapped_addresses.cpp
index 5443875c..9ca06ddc 100644
--- a/tests/integration/tables/memory_array_mapped_addresses.cpp
+++ b/tests/integration/tables/memory_array_mapped_addresses.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(memoryArrayMappedAddresses, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"handle", NormalType}
   //      {"memory_array_handle", NormalType}
   //      {"starting_address", NormalType}
diff --git a/tests/integration/tables/memory_arrays.cpp b/tests/integration/tables/memory_arrays.cpp
index a65544f3..7ad53e15 100644
--- a/tests/integration/tables/memory_arrays.cpp
+++ b/tests/integration/tables/memory_arrays.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(memoryArrays, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"handle", NormalType}
   //      {"location", NormalType}
   //      {"use", NormalType}
diff --git a/tests/integration/tables/memory_device_mapped_addresses.cpp b/tests/integration/tables/memory_device_mapped_addresses.cpp
index 95f4dcd5..6a81c4c7 100644
--- a/tests/integration/tables/memory_device_mapped_addresses.cpp
+++ b/tests/integration/tables/memory_device_mapped_addresses.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(memoryDeviceMappedAddresses, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"handle", NormalType}
   //      {"memory_device_handle", NormalType}
   //      {"memory_array_mapped_address_handle", NormalType}
diff --git a/tests/integration/tables/memory_devices.cpp b/tests/integration/tables/memory_devices.cpp
index a314f8c2..9ca266fa 100644
--- a/tests/integration/tables/memory_devices.cpp
+++ b/tests/integration/tables/memory_devices.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(memoryDevices, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"handle", NormalType}
   //      {"array_handle", NormalType}
   //      {"form_factor", NormalType}
diff --git a/tests/integration/tables/memory_error_info.cpp b/tests/integration/tables/memory_error_info.cpp
index 84c14a17..ce6af5f9 100644
--- a/tests/integration/tables/memory_error_info.cpp
+++ b/tests/integration/tables/memory_error_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(memoryErrorInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"handle", NormalType}
   //      {"error_type", NormalType}
   //      {"error_granularity", NormalType}
diff --git a/tests/integration/tables/memory_info.cpp b/tests/integration/tables/memory_info.cpp
index 3b6a27e6..c8c02f62 100644
--- a/tests/integration/tables/memory_info.cpp
+++ b/tests/integration/tables/memory_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(memoryInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"memory_total", IntType}
   //      {"memory_free", IntType}
   //      {"buffers", IntType}
diff --git a/tests/integration/tables/memory_map.cpp b/tests/integration/tables/memory_map.cpp
index 79616a62..acfb685c 100644
--- a/tests/integration/tables/memory_map.cpp
+++ b/tests/integration/tables/memory_map.cpp
@@ -26,9 +26,9 @@ class MemoryMapTest : public testing::Test {
 TEST_F(MemoryMapTest, test_sanity) {
   QueryData data = execute_query("select * from memory_map");
   ASSERT_GT(data.size(), 0ul);
-  ValidatatioMap row_map = {{"name", NonEmptyString},
-                            {"start", NonNegativeInt},
-                            {"end", NonNegativeInt}};
+  ValidationMap row_map = {{"name", NonEmptyString},
+                           {"start", NonNegativeInt},
+                           {"end", NonNegativeInt}};
   validate_rows(data, row_map);
 
   for (const auto& row : data) {
diff --git a/tests/integration/tables/mounts.cpp b/tests/integration/tables/mounts.cpp
index e110c29b..3b7b0d3f 100644
--- a/tests/integration/tables/mounts.cpp
+++ b/tests/integration/tables/mounts.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(mounts, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"device", NormalType}
   //      {"device_alias", NormalType}
   //      {"path", NormalType}
diff --git a/tests/integration/tables/msr.cpp b/tests/integration/tables/msr.cpp
index a7ddd465..e3a43461 100644
--- a/tests/integration/tables/msr.cpp
+++ b/tests/integration/tables/msr.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(msr, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"processor_number", IntType}
   //      {"turbo_disabled", IntType}
   //      {"turbo_ratio_limit", IntType}
diff --git a/tests/integration/tables/nfs_shares.cpp b/tests/integration/tables/nfs_shares.cpp
index c1733760..5b156564 100644
--- a/tests/integration/tables/nfs_shares.cpp
+++ b/tests/integration/tables/nfs_shares.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(nfsShares, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"share", NormalType}
   //      {"options", NormalType}
   //      {"readonly", IntType}
diff --git a/tests/integration/tables/npm_packages.cpp b/tests/integration/tables/npm_packages.cpp
index 667a9d1d..656b14ba 100644
--- a/tests/integration/tables/npm_packages.cpp
+++ b/tests/integration/tables/npm_packages.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(npmPackages, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"version", NormalType}
   //      {"description", NormalType}
diff --git a/tests/integration/tables/ntdomains.cpp b/tests/integration/tables/ntdomains.cpp
index c3575353..a31cb715 100644
--- a/tests/integration/tables/ntdomains.cpp
+++ b/tests/integration/tables/ntdomains.cpp
@@ -26,7 +26,7 @@ TEST_F(NtDomains, test_sanity) {
 
   ASSERT_GE(data.size(), 1ul);
 
-  ValidatatioMap row_map = {
+  ValidationMap row_map = {
       {"name", NonEmptyString},
       {"client_site_name", NormalType},
       {"dc_site_name", NormalType},
diff --git a/tests/integration/tables/ntfs_acl_permissions.cpp b/tests/integration/tables/ntfs_acl_permissions.cpp
index 7dbced09..cfa7fe05 100644
--- a/tests/integration/tables/ntfs_acl_permissions.cpp
+++ b/tests/integration/tables/ntfs_acl_permissions.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(ntfsAclPermissions, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"type", NormalType}
   //      {"principal", NormalType}
diff --git a/tests/integration/tables/nvram.cpp b/tests/integration/tables/nvram.cpp
index 84ab12d1..adfdc623 100644
--- a/tests/integration/tables/nvram.cpp
+++ b/tests/integration/tables/nvram.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(nvram, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"type", NormalType}
   //      {"value", NormalType}
diff --git a/tests/integration/tables/oem_strings.cpp b/tests/integration/tables/oem_strings.cpp
index 32486b64..61c6a313 100644
--- a/tests/integration/tables/oem_strings.cpp
+++ b/tests/integration/tables/oem_strings.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(oemStrings, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"handle", NormalType}
   //      {"number", IntType}
   //      {"value", NormalType}
diff --git a/tests/integration/tables/opera_extensions.cpp b/tests/integration/tables/opera_extensions.cpp
index 00e1a01c..4dfa73ac 100644
--- a/tests/integration/tables/opera_extensions.cpp
+++ b/tests/integration/tables/opera_extensions.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(operaExtensions, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"uid", IntType}
   //      {"name", NormalType}
   //      {"identifier", NormalType}
diff --git a/tests/integration/tables/os_version.cpp b/tests/integration/tables/os_version.cpp
index 860f4ef2..bdce1974 100644
--- a/tests/integration/tables/os_version.cpp
+++ b/tests/integration/tables/os_version.cpp
@@ -26,7 +26,7 @@ TEST_F(OsVersion, test_sanity) {
 
   ASSERT_EQ(data.size(), 1ul);
 
-  ValidatatioMap row_map = {
+  ValidationMap row_map = {
       {"name", NonEmptyString},
       {"version", NonEmptyString},
       {"major", NonNegativeInt},
diff --git a/tests/integration/tables/osquery_events.cpp b/tests/integration/tables/osquery_events.cpp
index 6ee4f35d..f94cb15a 100644
--- a/tests/integration/tables/osquery_events.cpp
+++ b/tests/integration/tables/osquery_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(osqueryEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"publisher", NormalType}
   //      {"type", NormalType}
diff --git a/tests/integration/tables/osquery_extensions.cpp b/tests/integration/tables/osquery_extensions.cpp
index 7b93b128..3e2e8934 100644
--- a/tests/integration/tables/osquery_extensions.cpp
+++ b/tests/integration/tables/osquery_extensions.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(osqueryExtensions, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"uuid", IntType}
   //      {"name", NormalType}
   //      {"version", NormalType}
diff --git a/tests/integration/tables/osquery_flags.cpp b/tests/integration/tables/osquery_flags.cpp
index 1e09755a..c82acb80 100644
--- a/tests/integration/tables/osquery_flags.cpp
+++ b/tests/integration/tables/osquery_flags.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -33,7 +32,7 @@ TEST_F(osqueryFlags, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"type", NormalType}
   //      {"description", NormalType}
diff --git a/tests/integration/tables/osquery_info.cpp b/tests/integration/tables/osquery_info.cpp
index 76402a05..e5ee254e 100644
--- a/tests/integration/tables/osquery_info.cpp
+++ b/tests/integration/tables/osquery_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(osqueryInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"pid", IntType}
   //      {"uuid", NormalType}
   //      {"instance_id", NormalType}
diff --git a/tests/integration/tables/osquery_packs.cpp b/tests/integration/tables/osquery_packs.cpp
index c28c949f..4d7aaa76 100644
--- a/tests/integration/tables/osquery_packs.cpp
+++ b/tests/integration/tables/osquery_packs.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(osqueryPacks, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"platform", NormalType}
   //      {"version", NormalType}
diff --git a/tests/integration/tables/osquery_registry.cpp b/tests/integration/tables/osquery_registry.cpp
index c89feb41..337db35e 100644
--- a/tests/integration/tables/osquery_registry.cpp
+++ b/tests/integration/tables/osquery_registry.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(osqueryRegistry, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"registry", NormalType}
   //      {"name", NormalType}
   //      {"owner_uuid", IntType}
diff --git a/tests/integration/tables/osquery_schedule.cpp b/tests/integration/tables/osquery_schedule.cpp
index 87e12748..6f75514b 100644
--- a/tests/integration/tables/osquery_schedule.cpp
+++ b/tests/integration/tables/osquery_schedule.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(osquerySchedule, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"query", NormalType}
   //      {"interval", IntType}
diff --git a/tests/integration/tables/package_bom.cpp b/tests/integration/tables/package_bom.cpp
index 5a1cc80e..21ebda14 100644
--- a/tests/integration/tables/package_bom.cpp
+++ b/tests/integration/tables/package_bom.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(packageBom, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"filepath", NormalType}
   //      {"uid", IntType}
   //      {"gid", IntType}
diff --git a/tests/integration/tables/package_install_history.cpp b/tests/integration/tables/package_install_history.cpp
index d993af8b..3c3cc768 100644
--- a/tests/integration/tables/package_install_history.cpp
+++ b/tests/integration/tables/package_install_history.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(packageInstallHistory, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"package_id", NormalType}
   //      {"time", IntType}
   //      {"name", NormalType}
diff --git a/tests/integration/tables/package_receipts.cpp b/tests/integration/tables/package_receipts.cpp
index a95f6cd5..fbf6258d 100644
--- a/tests/integration/tables/package_receipts.cpp
+++ b/tests/integration/tables/package_receipts.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(packageReceipts, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"package_id", NormalType}
   //      {"package_filename", NormalType}
   //      {"version", NormalType}
diff --git a/tests/integration/tables/patches.cpp b/tests/integration/tables/patches.cpp
index 971501dd..789d51b9 100644
--- a/tests/integration/tables/patches.cpp
+++ b/tests/integration/tables/patches.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(patches, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"csname", NormalType}
   //      {"hotfix_id", NormalType}
   //      {"caption", NormalType}
diff --git a/tests/integration/tables/pci_devices.cpp b/tests/integration/tables/pci_devices.cpp
index 6c403291..c4abe7f4 100644
--- a/tests/integration/tables/pci_devices.cpp
+++ b/tests/integration/tables/pci_devices.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(pciDevices, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"pci_slot", NormalType}
   //      {"pci_class", NormalType}
   //      {"driver", NormalType}
diff --git a/tests/integration/tables/physical_disk_performance.cpp b/tests/integration/tables/physical_disk_performance.cpp
index b2aed604..84ab7bf2 100644
--- a/tests/integration/tables/physical_disk_performance.cpp
+++ b/tests/integration/tables/physical_disk_performance.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(physicalDiskPerformance, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"avg_disk_bytes_per_read", IntType}
   //      {"avg_disk_bytes_per_write", IntType}
diff --git a/tests/integration/tables/pipes.cpp b/tests/integration/tables/pipes.cpp
index bf700ea8..5ed415ad 100644
--- a/tests/integration/tables/pipes.cpp
+++ b/tests/integration/tables/pipes.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(pipes, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"pid", IntType}
   //      {"name", NormalType}
   //      {"instances", IntType}
diff --git a/tests/integration/tables/pkg_packages.cpp b/tests/integration/tables/pkg_packages.cpp
index 92b73bd2..4e1a7d54 100644
--- a/tests/integration/tables/pkg_packages.cpp
+++ b/tests/integration/tables/pkg_packages.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(pkgPackages, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"version", NormalType}
   //      {"flatsize", IntType}
diff --git a/tests/integration/tables/platform_info.cpp b/tests/integration/tables/platform_info.cpp
index de71baa9..4eb46723 100644
--- a/tests/integration/tables/platform_info.cpp
+++ b/tests/integration/tables/platform_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(platformInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"vendor", NormalType}
   //      {"version", NormalType}
   //      {"date", NormalType}
diff --git a/tests/integration/tables/plist.cpp b/tests/integration/tables/plist.cpp
index dc1cc77e..20c45233 100644
--- a/tests/integration/tables/plist.cpp
+++ b/tests/integration/tables/plist.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(plist, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"key", NormalType}
   //      {"subkey", NormalType}
   //      {"value", NormalType}
diff --git a/tests/integration/tables/portage_keywords.cpp b/tests/integration/tables/portage_keywords.cpp
index fa40cbef..82cdecc4 100644
--- a/tests/integration/tables/portage_keywords.cpp
+++ b/tests/integration/tables/portage_keywords.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(portageKeywords, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"package", NormalType}
   //      {"version", NormalType}
   //      {"keyword", NormalType}
diff --git a/tests/integration/tables/portage_packages.cpp b/tests/integration/tables/portage_packages.cpp
index 6580eec3..329719bc 100644
--- a/tests/integration/tables/portage_packages.cpp
+++ b/tests/integration/tables/portage_packages.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(portagePackages, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"package", NormalType}
   //      {"version", NormalType}
   //      {"slot", NormalType}
diff --git a/tests/integration/tables/portage_use.cpp b/tests/integration/tables/portage_use.cpp
index 0f46c16b..4b5f6ceb 100644
--- a/tests/integration/tables/portage_use.cpp
+++ b/tests/integration/tables/portage_use.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(portageUse, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"package", NormalType}
   //      {"version", NormalType}
   //      {"use", NormalType}
diff --git a/tests/integration/tables/power_sensors.cpp b/tests/integration/tables/power_sensors.cpp
index 0349e22b..f6d45d46 100644
--- a/tests/integration/tables/power_sensors.cpp
+++ b/tests/integration/tables/power_sensors.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(powerSensors, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"key", NormalType}
   //      {"category", NormalType}
   //      {"name", NormalType}
diff --git a/tests/integration/tables/powershell_events.cpp b/tests/integration/tables/powershell_events.cpp
index ed1145a1..2e8b23b6 100644
--- a/tests/integration/tables/powershell_events.cpp
+++ b/tests/integration/tables/powershell_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(powershellEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"time", IntType}
   //      {"datetime", NormalType}
   //      {"script_block_id", NormalType}
diff --git a/tests/integration/tables/preferences.cpp b/tests/integration/tables/preferences.cpp
index 66e2b083..d53bd45a 100644
--- a/tests/integration/tables/preferences.cpp
+++ b/tests/integration/tables/preferences.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(preferences, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"domain", NormalType}
   //      {"key", NormalType}
   //      {"subkey", NormalType}
diff --git a/tests/integration/tables/process_envs.cpp b/tests/integration/tables/process_envs.cpp
index b194e8f0..41961370 100644
--- a/tests/integration/tables/process_envs.cpp
+++ b/tests/integration/tables/process_envs.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -34,7 +33,7 @@ class ProcessEnvs : public testing::Test {
 TEST_F(ProcessEnvs, test_sanity) {
   QueryData data = execute_query("select * from process_envs");
 
-  ValidatatioMap row_map = {
+  ValidationMap row_map = {
       {"pid", NonNegativeInt},
       {"key", NonEmptyString},
       {"value", NormalType},
diff --git a/tests/integration/tables/process_events.cpp b/tests/integration/tables/process_events.cpp
index 4850eeab..7c75b1f5 100644
--- a/tests/integration/tables/process_events.cpp
+++ b/tests/integration/tables/process_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(processEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"pid", IntType}
   //      {"path", NormalType}
   //      {"mode", NormalType}
diff --git a/tests/integration/tables/process_file_events.cpp b/tests/integration/tables/process_file_events.cpp
index 00998c72..0d394665 100644
--- a/tests/integration/tables/process_file_events.cpp
+++ b/tests/integration/tables/process_file_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(processFileEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"operation", NormalType}
   //      {"pid", IntType}
   //      {"ppid", IntType}
diff --git a/tests/integration/tables/process_memory_map.cpp b/tests/integration/tables/process_memory_map.cpp
index b89245b4..7fdc16f3 100644
--- a/tests/integration/tables/process_memory_map.cpp
+++ b/tests/integration/tables/process_memory_map.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(processMemoryMap, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"pid", IntType}
   //      {"start", NormalType}
   //      {"end", NormalType}
diff --git a/tests/integration/tables/process_namespaces.cpp b/tests/integration/tables/process_namespaces.cpp
index 6d08eb4d..9bf74152 100644
--- a/tests/integration/tables/process_namespaces.cpp
+++ b/tests/integration/tables/process_namespaces.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(processNamespaces, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"pid", IntType}
   //      {"cgroup_namespace", NormalType}
   //      {"ipc_namespace", NormalType}
diff --git a/tests/integration/tables/process_open_files.cpp b/tests/integration/tables/process_open_files.cpp
index e8778579..298d9943 100644
--- a/tests/integration/tables/process_open_files.cpp
+++ b/tests/integration/tables/process_open_files.cpp
@@ -58,7 +58,7 @@ bool checkProcessOpenFilePath(std::string const& value){
 TEST_F(ProcessOpenFilesTest, test_sanity) {
   QueryData data = execute_query("select * from process_open_files");
   ASSERT_GT(data.size(), 0ul);
-  ValidatatioMap row_map = {
+  ValidationMap row_map = {
       {"pid", NonNegativeInt},
       {"fd", NonNegativeInt},
       {"path", checkProcessOpenFilePath},
diff --git a/tests/integration/tables/process_open_sockets.cpp b/tests/integration/tables/process_open_sockets.cpp
index 790dc080..7b1b2213 100644
--- a/tests/integration/tables/process_open_sockets.cpp
+++ b/tests/integration/tables/process_open_sockets.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(processOpenSockets, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"pid", IntType}
   //      {"fd", IntType}
   //      {"socket", IntType}
diff --git a/tests/integration/tables/processes.cpp b/tests/integration/tables/processes.cpp
index 3cda4249..410db9b8 100644
--- a/tests/integration/tables/processes.cpp
+++ b/tests/integration/tables/processes.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -37,7 +36,7 @@ TEST_F(ProcessesTest, test_sanity) {
 
   EXPECT_GE(now, boot_time);
 
-  ValidatatioMap row_map = {
+  ValidationMap row_map = {
       {"pid", IntType},
       {"name", NormalType},
       {"path", NormalType},
diff --git a/tests/integration/tables/programs.cpp b/tests/integration/tables/programs.cpp
index 35893d74..26612b66 100644
--- a/tests/integration/tables/programs.cpp
+++ b/tests/integration/tables/programs.cpp
@@ -24,15 +24,15 @@ class ProgramsTest : public testing::Test {
 TEST_F(ProgramsTest, test_sanity) {
   QueryData data = execute_query("select * from programs");
   ASSERT_GT(data.size(), 0ul);
-  ValidatatioMap row_map = {{"name", NormalType},
-                            {"version", NormalType},
-                            {"install_location", NormalType},
-                            {"install_source", NormalType},
-                            {"language", NormalType},
-                            {"publisher", NormalType},
-                            {"uninstall_string", NormalType},
-                            {"install_date", NormalType},
-                            {"identifying_number", NormalType}};
+  ValidationMap row_map = {{"name", NormalType},
+                           {"version", NormalType},
+                           {"install_location", NormalType},
+                           {"install_source", NormalType},
+                           {"language", NormalType},
+                           {"publisher", NormalType},
+                           {"uninstall_string", NormalType},
+                           {"install_date", NormalType},
+                           {"identifying_number", NormalType}};
   validate_rows(data, row_map);
 }
 
diff --git a/tests/integration/tables/prometheus_metrics.cpp b/tests/integration/tables/prometheus_metrics.cpp
index b10301af..d593c4c9 100644
--- a/tests/integration/tables/prometheus_metrics.cpp
+++ b/tests/integration/tables/prometheus_metrics.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(prometheusMetrics, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"target_name", NormalType}
   //      {"metric_name", NormalType}
   //      {"metric_value", NormalType}
diff --git a/tests/integration/tables/python_packages.cpp b/tests/integration/tables/python_packages.cpp
index 2b4e8814..5c12b989 100644
--- a/tests/integration/tables/python_packages.cpp
+++ b/tests/integration/tables/python_packages.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(pythonPackages, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"version", NormalType}
   //      {"summary", NormalType}
diff --git a/tests/integration/tables/quicklook_cache.cpp b/tests/integration/tables/quicklook_cache.cpp
index 259f7e76..12b5b994 100644
--- a/tests/integration/tables/quicklook_cache.cpp
+++ b/tests/integration/tables/quicklook_cache.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(quicklookCache, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"rowid", IntType}
   //      {"fs_id", NormalType}
diff --git a/tests/integration/tables/registry.cpp b/tests/integration/tables/registry.cpp
index 9b607646..b546abf0 100644
--- a/tests/integration/tables/registry.cpp
+++ b/tests/integration/tables/registry.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -26,7 +25,7 @@ class RegistryTest : public testing::Test {
 TEST_F(RegistryTest, test_sanity) {
   QueryData const rows = execute_query("select * from registry");
   ASSERT_GT(rows.size(), 0ul);
-  auto const row_map = ValidatatioMap{
+  auto const row_map = ValidationMap{
       {"key", NonEmptyString},
       {"path", NonEmptyString},
       {"name", NonEmptyString},
diff --git a/tests/integration/tables/routes.cpp b/tests/integration/tables/routes.cpp
index 6ff7ec14..2ff09de1 100644
--- a/tests/integration/tables/routes.cpp
+++ b/tests/integration/tables/routes.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -25,7 +24,7 @@ class RoutesTest : public testing::Test {
 TEST_F(RoutesTest, test_sanity) {
   QueryData const data = execute_query("select * from routes");
 
-  auto const row_map = ValidatatioMap{
+  auto const row_map = ValidationMap{
       {"destination", verifyIpAddress},
       {"netmask", IntMinMaxCheck(0, 128)},
       {"gateway", NormalType},
diff --git a/tests/integration/tables/rpm_package_files.cpp b/tests/integration/tables/rpm_package_files.cpp
index 7281b4e2..bb90b160 100644
--- a/tests/integration/tables/rpm_package_files.cpp
+++ b/tests/integration/tables/rpm_package_files.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(rpmPackageFiles, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"package", NormalType}
   //      {"path", NormalType}
   //      {"username", NormalType}
diff --git a/tests/integration/tables/rpm_packages.cpp b/tests/integration/tables/rpm_packages.cpp
index 97164191..918112be 100644
--- a/tests/integration/tables/rpm_packages.cpp
+++ b/tests/integration/tables/rpm_packages.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(rpmPackages, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"version", NormalType}
   //      {"release", NormalType}
diff --git a/tests/integration/tables/running_apps.cpp b/tests/integration/tables/running_apps.cpp
index 12657c99..e0712373 100644
--- a/tests/integration/tables/running_apps.cpp
+++ b/tests/integration/tables/running_apps.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -36,9 +35,9 @@ TEST_F(runningApps, test_sanity) {
   // 3. Build validation map
   // See IntegrationTableTest.cpp for avaialbe flags
   // Or use custom DataCheck object
-  ValidatatioMap row_map = {{"pid", IntType},
-                            {"bundle_identifier", NormalType},
-                            {"is_active", IntType}};
+  ValidationMap row_map = {{"pid", IntType},
+                           {"bundle_identifier", NormalType},
+                           {"is_active", IntType}};
   // 4. Perform validation
   validate_rows(general_query_data, row_map);
   validate_rows(specific_query_data, row_map);
diff --git a/tests/integration/tables/safari_extensions.cpp b/tests/integration/tables/safari_extensions.cpp
index cc9909c2..b3f95aeb 100644
--- a/tests/integration/tables/safari_extensions.cpp
+++ b/tests/integration/tables/safari_extensions.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(safariExtensions, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"uid", IntType}
   //      {"name", NormalType}
   //      {"identifier", NormalType}
diff --git a/tests/integration/tables/sandboxes.cpp b/tests/integration/tables/sandboxes.cpp
index 0bc5a68c..a452379b 100644
--- a/tests/integration/tables/sandboxes.cpp
+++ b/tests/integration/tables/sandboxes.cpp
@@ -27,7 +27,7 @@ TEST_F(Sandboxes, test_sanity) {
   QueryData data = execute_query("select * from sandboxes");
 
   if (!data.empty()) {
-    ValidatatioMap row_map = {
+    ValidationMap row_map = {
         {"label", NonEmptyString},
         {"user", NonEmptyString},
         {"enabled", Bool},
diff --git a/tests/integration/tables/scheduled_tasks.cpp b/tests/integration/tables/scheduled_tasks.cpp
index a03f3346..b33bbb26 100644
--- a/tests/integration/tables/scheduled_tasks.cpp
+++ b/tests/integration/tables/scheduled_tasks.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(scheduledTasks, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"action", NormalType}
   //      {"path", NormalType}
diff --git a/tests/integration/tables/selinux_events.cpp b/tests/integration/tables/selinux_events.cpp
index 3df194dd..90504c4e 100644
--- a/tests/integration/tables/selinux_events.cpp
+++ b/tests/integration/tables/selinux_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(selinuxEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"type", NormalType}
   //      {"message", NormalType}
   //      {"time", IntType}
diff --git a/tests/integration/tables/services.cpp b/tests/integration/tables/services.cpp
index c943c8d4..eab58fa4 100644
--- a/tests/integration/tables/services.cpp
+++ b/tests/integration/tables/services.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(services, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"service_type", NormalType}
   //      {"display_name", NormalType}
diff --git a/tests/integration/tables/shadow.cpp b/tests/integration/tables/shadow.cpp
index 197e07a2..1cb361d9 100644
--- a/tests/integration/tables/shadow.cpp
+++ b/tests/integration/tables/shadow.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(shadow, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"password_status", NormalType}
   //      {"hash_alg", NormalType}
   //      {"last_change", IntType}
diff --git a/tests/integration/tables/shared_folders.cpp b/tests/integration/tables/shared_folders.cpp
index c449e5b9..056ab7c4 100644
--- a/tests/integration/tables/shared_folders.cpp
+++ b/tests/integration/tables/shared_folders.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(sharedFolders, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"path", NormalType}
   //}
diff --git a/tests/integration/tables/shared_memory.cpp b/tests/integration/tables/shared_memory.cpp
index 99246159..a7c28a35 100644
--- a/tests/integration/tables/shared_memory.cpp
+++ b/tests/integration/tables/shared_memory.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(sharedMemory, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"shmid", IntType}
   //      {"owner_uid", IntType}
   //      {"creator_uid", IntType}
diff --git a/tests/integration/tables/shared_resources.cpp b/tests/integration/tables/shared_resources.cpp
index 88627b73..f01a2dd3 100644
--- a/tests/integration/tables/shared_resources.cpp
+++ b/tests/integration/tables/shared_resources.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(sharedResources, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"description", NormalType}
   //      {"install_date", NormalType}
   //      {"status", NormalType}
diff --git a/tests/integration/tables/sharing_preferences.cpp b/tests/integration/tables/sharing_preferences.cpp
index 2cfc56f4..f12f07b5 100644
--- a/tests/integration/tables/sharing_preferences.cpp
+++ b/tests/integration/tables/sharing_preferences.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(sharingPreferences, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"screen_sharing", IntType}
   //      {"file_sharing", IntType}
   //      {"printer_sharing", IntType}
diff --git a/tests/integration/tables/shell_history.cpp b/tests/integration/tables/shell_history.cpp
index 96a510d1..7426a058 100644
--- a/tests/integration/tables/shell_history.cpp
+++ b/tests/integration/tables/shell_history.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(shellHistory, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"uid", IntType}
   //      {"time", IntType}
   //      {"command", NormalType}
diff --git a/tests/integration/tables/signature.cpp b/tests/integration/tables/signature.cpp
index 7c25e2e6..991c2eea 100644
--- a/tests/integration/tables/signature.cpp
+++ b/tests/integration/tables/signature.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(signature, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"hash_resources", IntType}
   //      {"arch", NormalType}
diff --git a/tests/integration/tables/sip_config.cpp b/tests/integration/tables/sip_config.cpp
index ca32a7d3..ac6147b1 100644
--- a/tests/integration/tables/sip_config.cpp
+++ b/tests/integration/tables/sip_config.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(sipConfig, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"config_flag", NormalType}
   //      {"enabled", IntType}
   //      {"enabled_nvram", IntType}
diff --git a/tests/integration/tables/smart_drive_info.cpp b/tests/integration/tables/smart_drive_info.cpp
index 81a1e55f..3eba7573 100644
--- a/tests/integration/tables/smart_drive_info.cpp
+++ b/tests/integration/tables/smart_drive_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(smartDriveInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"device_name", NormalType}
   //      {"disk_id", IntType}
   //      {"driver_type", NormalType}
diff --git a/tests/integration/tables/smbios_tables.cpp b/tests/integration/tables/smbios_tables.cpp
index 59caad10..85a04b7a 100644
--- a/tests/integration/tables/smbios_tables.cpp
+++ b/tests/integration/tables/smbios_tables.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(smbiosTables, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"number", IntType}
   //      {"type", IntType}
   //      {"description", NormalType}
diff --git a/tests/integration/tables/smc_keys.cpp b/tests/integration/tables/smc_keys.cpp
index 9f8f5392..3373eafd 100644
--- a/tests/integration/tables/smc_keys.cpp
+++ b/tests/integration/tables/smc_keys.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(smcKeys, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"key", NormalType}
   //      {"type", NormalType}
   //      {"size", IntType}
diff --git a/tests/integration/tables/socket_events.cpp b/tests/integration/tables/socket_events.cpp
index 21ba297f..aece81a6 100644
--- a/tests/integration/tables/socket_events.cpp
+++ b/tests/integration/tables/socket_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(socketEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"action", NormalType}
   //      {"pid", IntType}
   //      {"path", NormalType}
diff --git a/tests/integration/tables/ssh_configs.cpp b/tests/integration/tables/ssh_configs.cpp
index 3a6c948a..bb12503f 100644
--- a/tests/integration/tables/ssh_configs.cpp
+++ b/tests/integration/tables/ssh_configs.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(sshConfigs, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"uid", IntType}
   //      {"block", NormalType}
   //      {"option", NormalType}
diff --git a/tests/integration/tables/startup_items.cpp b/tests/integration/tables/startup_items.cpp
index 5f0bb91e..70589a40 100644
--- a/tests/integration/tables/startup_items.cpp
+++ b/tests/integration/tables/startup_items.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(startupItems, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"path", NormalType}
   //      {"args", NormalType}
diff --git a/tests/integration/tables/sudoers.cpp b/tests/integration/tables/sudoers.cpp
index bc83b801..89c5fd46 100644
--- a/tests/integration/tables/sudoers.cpp
+++ b/tests/integration/tables/sudoers.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(sudoers, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"header", NormalType}
   //      {"rule_details", NormalType}
   //}
diff --git a/tests/integration/tables/suid_bin.cpp b/tests/integration/tables/suid_bin.cpp
index 0bdab356..a956d124 100644
--- a/tests/integration/tables/suid_bin.cpp
+++ b/tests/integration/tables/suid_bin.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(suidBin, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"username", NormalType}
   //      {"groupname", NormalType}
diff --git a/tests/integration/tables/syslog_events.cpp b/tests/integration/tables/syslog_events.cpp
index 526032a2..f468cc3f 100644
--- a/tests/integration/tables/syslog_events.cpp
+++ b/tests/integration/tables/syslog_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(syslogEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"time", IntType}
   //      {"datetime", NormalType}
   //      {"host", NormalType}
diff --git a/tests/integration/tables/system_controls.cpp b/tests/integration/tables/system_controls.cpp
index 9de10612..affc8008 100644
--- a/tests/integration/tables/system_controls.cpp
+++ b/tests/integration/tables/system_controls.cpp
@@ -24,23 +24,24 @@ class SystemControlsTest : public testing::Test {
 
 TEST_F(SystemControlsTest, test_sanity) {
   auto const rows = execute_query("select * from system_controls");
-  auto const row_map = ValidatatioMap{
+  auto const row_map = ValidationMap{
       {"name", NonEmptyString},
       {"oid", NormalType},
-      {"subsystem", SpecificValuesCheck{"",
-                                        "abi",
-                                        "debug",
-                                        "dev",
-                                        "fs",
-                                        "fscache",
-                                        "hw",
-                                        "kern",
-                                        "kernel",
-                                        "machdep",
-                                        "net",
-                                        "user",
-                                        "vfs",
-                                        "vm"}},
+      {"subsystem",
+       SpecificValuesCheck{"",
+                           "abi",
+                           "debug",
+                           "dev",
+                           "fs",
+                           "fscache",
+                           "hw",
+                           "kern",
+                           "kernel",
+                           "machdep",
+                           "net",
+                           "user",
+                           "vfs",
+                           "vm"}},
       {"current_value", NormalType},
       {"config_value", NormalType},
       {"type",
diff --git a/tests/integration/tables/system_info.cpp b/tests/integration/tables/system_info.cpp
index b64d245b..fa119581 100644
--- a/tests/integration/tables/system_info.cpp
+++ b/tests/integration/tables/system_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -25,21 +24,21 @@ class SystemInfo : public testing::Test {
 TEST_F(SystemInfo, test_sanity) {
   QueryData data = execute_query("select * from system_info");
   ASSERT_EQ(data.size(), 1ul);
-  ValidatatioMap row_map = {{"hostname", NormalType},
-                            {"uuid", ValidUUID},
-                            {"cpu_type", NonEmptyString},
-                            {"cpu_subtype", NormalType},
-                            {"cpu_brand", NormalType},
-                            {"cpu_physical_cores", NonNegativeInt},
-                            {"cpu_logical_cores", NonNegativeInt},
-                            {"cpu_microcode", NormalType},
-                            {"physical_memory", NonNegativeInt},
-                            {"hardware_vendor", NormalType},
-                            {"hardware_model", NormalType},
-                            {"hardware_version", NormalType},
-                            {"hardware_serial", NormalType},
-                            {"computer_name", NormalType},
-                            {"local_hostname", NonEmptyString}};
+  ValidationMap row_map = {{"hostname", NormalType},
+                           {"uuid", ValidUUID},
+                           {"cpu_type", NonEmptyString},
+                           {"cpu_subtype", NormalType},
+                           {"cpu_brand", NormalType},
+                           {"cpu_physical_cores", NonNegativeInt},
+                           {"cpu_logical_cores", NonNegativeInt},
+                           {"cpu_microcode", NormalType},
+                           {"physical_memory", NonNegativeInt},
+                           {"hardware_vendor", NormalType},
+                           {"hardware_model", NormalType},
+                           {"hardware_version", NormalType},
+                           {"hardware_serial", NormalType},
+                           {"computer_name", NormalType},
+                           {"local_hostname", NonEmptyString}};
   validate_rows(data, row_map);
 }
 
diff --git a/tests/integration/tables/temperature_sensors.cpp b/tests/integration/tables/temperature_sensors.cpp
index c484957a..3fe7de6f 100644
--- a/tests/integration/tables/temperature_sensors.cpp
+++ b/tests/integration/tables/temperature_sensors.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(temperatureSensors, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"key", NormalType}
   //      {"name", NormalType}
   //      {"celsius", NormalType}
diff --git a/tests/integration/tables/time.cpp b/tests/integration/tables/time.cpp
index 6f0fe7df..c704a3c3 100644
--- a/tests/integration/tables/time.cpp
+++ b/tests/integration/tables/time.cpp
@@ -28,7 +28,7 @@ TEST_F(Time, test_sanity) {
 
   ASSERT_EQ(data.size(), 1ul);
 
-  ValidatatioMap row_map = {
+  ValidationMap row_map = {
       {"weekday", NonEmptyString},
       {"year", IntType},
       {"month", IntMinMaxCheck(1, 12)},
diff --git a/tests/integration/tables/time_machine_backups.cpp b/tests/integration/tables/time_machine_backups.cpp
index 96922d21..b6a34ef6 100644
--- a/tests/integration/tables/time_machine_backups.cpp
+++ b/tests/integration/tables/time_machine_backups.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(timeMachineBackups, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"destination_id", NormalType}
   //      {"backup_date", IntType}
   //}
diff --git a/tests/integration/tables/time_machine_destinations.cpp b/tests/integration/tables/time_machine_destinations.cpp
index bba080a1..783a8385 100644
--- a/tests/integration/tables/time_machine_destinations.cpp
+++ b/tests/integration/tables/time_machine_destinations.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(timeMachineDestinations, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"alias", NormalType}
   //      {"destination_id", NormalType}
   //      {"consistency_scan_date", IntType}
diff --git a/tests/integration/tables/ulimit_info.cpp b/tests/integration/tables/ulimit_info.cpp
index af4ff3f9..18d04fc2 100644
--- a/tests/integration/tables/ulimit_info.cpp
+++ b/tests/integration/tables/ulimit_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(ulimitInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"type", NormalType}
   //      {"soft_limit", NormalType}
   //      {"hard_limit", NormalType}
diff --git a/tests/integration/tables/uptime.cpp b/tests/integration/tables/uptime.cpp
index 8be2ba6e..47323daf 100644
--- a/tests/integration/tables/uptime.cpp
+++ b/tests/integration/tables/uptime.cpp
@@ -22,11 +22,11 @@ TEST_F(UptimeTests, test_sanity) {
   QueryData data = execute_query("select * from uptime");
   ASSERT_EQ(data.size(), 1ul);
 
-  ValidatatioMap row_map = {{"days", NonNegativeInt},
-                            {"hours", IntMinMaxCheck(0, 24)},
-                            {"minutes", IntMinMaxCheck(0, 60)},
-                            {"seconds", IntMinMaxCheck(0, 60)},
-                            {"total_seconds", NonNegativeInt}};
+  ValidationMap row_map = {{"days", NonNegativeInt},
+                           {"hours", IntMinMaxCheck(0, 24)},
+                           {"minutes", IntMinMaxCheck(0, 60)},
+                           {"seconds", IntMinMaxCheck(0, 60)},
+                           {"total_seconds", NonNegativeInt}};
 
   validate_rows(data, row_map);
 }
diff --git a/tests/integration/tables/usb_devices.cpp b/tests/integration/tables/usb_devices.cpp
index f25b2e71..7761fcbd 100644
--- a/tests/integration/tables/usb_devices.cpp
+++ b/tests/integration/tables/usb_devices.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(usbDevices, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"usb_address", IntType}
   //      {"usb_port", IntType}
   //      {"vendor", NormalType}
diff --git a/tests/integration/tables/user_events.cpp b/tests/integration/tables/user_events.cpp
index ecc3befc..81484e6e 100644
--- a/tests/integration/tables/user_events.cpp
+++ b/tests/integration/tables/user_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(userEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"uid", IntType}
   //      {"auid", IntType}
   //      {"pid", IntType}
diff --git a/tests/integration/tables/user_groups.cpp b/tests/integration/tables/user_groups.cpp
index edb5cdf1..39525d49 100644
--- a/tests/integration/tables/user_groups.cpp
+++ b/tests/integration/tables/user_groups.cpp
@@ -24,10 +24,7 @@ class UserGroups : public testing::Test {
 TEST_F(UserGroups, test_sanity) {
   QueryData data = execute_query("select * from user_groups");
   ASSERT_GT(data.size(), 0ul);
-  ValidatatioMap row_map = {
-    {"uid", verifyUidGid},
-    {"gid", verifyUidGid}
-  };
+  ValidationMap row_map = {{"uid", verifyUidGid}, {"gid", verifyUidGid}};
   validate_rows(data, row_map);
 }
 
diff --git a/tests/integration/tables/user_interaction_events.cpp b/tests/integration/tables/user_interaction_events.cpp
index 21750793..b80bd1f6 100644
--- a/tests/integration/tables/user_interaction_events.cpp
+++ b/tests/integration/tables/user_interaction_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(userInteractionEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"time", IntType}
   //}
   // 4. Perform validation
diff --git a/tests/integration/tables/user_ssh_keys.cpp b/tests/integration/tables/user_ssh_keys.cpp
index d2de40ec..258dff02 100644
--- a/tests/integration/tables/user_ssh_keys.cpp
+++ b/tests/integration/tables/user_ssh_keys.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(userSshKeys, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"uid", IntType}
   //      {"path", NormalType}
   //      {"encrypted", IntType}
diff --git a/tests/integration/tables/users.cpp b/tests/integration/tables/users.cpp
index 0d685933..2e86a822 100644
--- a/tests/integration/tables/users.cpp
+++ b/tests/integration/tables/users.cpp
@@ -27,7 +27,7 @@ class UsersTest : public testing::Test {
 TEST_F(UsersTest, test_sanity) {
   auto const rows = execute_query("select * from users");
   ASSERT_GE(rows.size(), 1ul); // There must be at least one user
-  auto row_map = ValidatatioMap{
+  auto row_map = ValidationMap{
       {"uid", NonNegativeInt},
       {"uid_signed", IntType},
       {"gid_signed", IntType},
diff --git a/tests/integration/tables/video_info.cpp b/tests/integration/tables/video_info.cpp
index 04088dc6..a79fb254 100644
--- a/tests/integration/tables/video_info.cpp
+++ b/tests/integration/tables/video_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(videoInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"color_depth", IntType}
   //      {"driver", NormalType}
   //      {"driver_date", NormalType}
diff --git a/tests/integration/tables/virtual_memory_info.cpp b/tests/integration/tables/virtual_memory_info.cpp
index 5763b593..c2a2e9f4 100644
--- a/tests/integration/tables/virtual_memory_info.cpp
+++ b/tests/integration/tables/virtual_memory_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(virtualMemoryInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"free", IntType}
   //      {"active", IntType}
   //      {"inactive", IntType}
diff --git a/tests/integration/tables/wifi_networks.cpp b/tests/integration/tables/wifi_networks.cpp
index b86929cc..4185d316 100644
--- a/tests/integration/tables/wifi_networks.cpp
+++ b/tests/integration/tables/wifi_networks.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(wifiNetworks, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"ssid", NormalType}
   //      {"network_name", NormalType}
   //      {"security_type", NormalType}
diff --git a/tests/integration/tables/wifi_status.cpp b/tests/integration/tables/wifi_status.cpp
index 35982272..360c0e77 100644
--- a/tests/integration/tables/wifi_status.cpp
+++ b/tests/integration/tables/wifi_status.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(wifiStatus, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"interface", NormalType}
   //      {"ssid", NormalType}
   //      {"bssid", NormalType}
diff --git a/tests/integration/tables/wifi_survey.cpp b/tests/integration/tables/wifi_survey.cpp
index f6fb14c2..dd7b031c 100644
--- a/tests/integration/tables/wifi_survey.cpp
+++ b/tests/integration/tables/wifi_survey.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(wifiSurvey, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"interface", NormalType}
   //      {"ssid", NormalType}
   //      {"bssid", NormalType}
diff --git a/tests/integration/tables/winbaseobj.cpp b/tests/integration/tables/winbaseobj.cpp
index 8f88096b..ade97f9b 100644
--- a/tests/integration/tables/winbaseobj.cpp
+++ b/tests/integration/tables/winbaseobj.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(winbaseobj, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"session_id", IntType}
   //      {"object_name", NormalType}
   //      {"object_type", NormalType}
diff --git a/tests/integration/tables/windows_crashes.cpp b/tests/integration/tables/windows_crashes.cpp
index bae4dc8d..b5b4aec0 100644
--- a/tests/integration/tables/windows_crashes.cpp
+++ b/tests/integration/tables/windows_crashes.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(windowsCrashes, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"datetime", NormalType}
   //      {"module", NormalType}
   //      {"path", NormalType}
diff --git a/tests/integration/tables/windows_events.cpp b/tests/integration/tables/windows_events.cpp
index bd400aec..9ef368af 100644
--- a/tests/integration/tables/windows_events.cpp
+++ b/tests/integration/tables/windows_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(windowsEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"time", IntType}
   //      {"datetime", NormalType}
   //      {"source", NormalType}
diff --git a/tests/integration/tables/windows_security_products.cpp b/tests/integration/tables/windows_security_products.cpp
index 9ca6a26e..be7d2066 100644
--- a/tests/integration/tables/windows_security_products.cpp
+++ b/tests/integration/tables/windows_security_products.cpp
@@ -24,7 +24,7 @@ class WindowsSecurityProductsTest : public testing::Test {
 TEST_F(WindowsSecurityProductsTest, test_sanity) {
   auto const data = execute_query("select * from windows_security_products");
 
-  ValidatatioMap row_map = {
+  ValidationMap row_map = {
       {"type", SpecificValuesCheck{"Firewall", "Antivirus", "Antispyware"}},
       {"name", NonEmptyString},
       {"state", SpecificValuesCheck{"On", "Off", "Snoozed", "Expired"}},
diff --git a/tests/integration/tables/wmi_bios_info.cpp b/tests/integration/tables/wmi_bios_info.cpp
index 8136f220..caf92de9 100644
--- a/tests/integration/tables/wmi_bios_info.cpp
+++ b/tests/integration/tables/wmi_bios_info.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(wmiBiosInfo, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"value", NormalType}
   //}
diff --git a/tests/integration/tables/wmi_cli_event_consumers.cpp b/tests/integration/tables/wmi_cli_event_consumers.cpp
index f550a697..cd0e3908 100644
--- a/tests/integration/tables/wmi_cli_event_consumers.cpp
+++ b/tests/integration/tables/wmi_cli_event_consumers.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(wmiCliEventConsumers, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"command_line_template", NormalType}
   //      {"executable_path", NormalType}
diff --git a/tests/integration/tables/wmi_event_filters.cpp b/tests/integration/tables/wmi_event_filters.cpp
index d8c3821c..280cd716 100644
--- a/tests/integration/tables/wmi_event_filters.cpp
+++ b/tests/integration/tables/wmi_event_filters.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(wmiEventFilters, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"query", NormalType}
   //      {"query_language", NormalType}
diff --git a/tests/integration/tables/wmi_filter_consumer_binding.cpp b/tests/integration/tables/wmi_filter_consumer_binding.cpp
index b1ac8388..50658f15 100644
--- a/tests/integration/tables/wmi_filter_consumer_binding.cpp
+++ b/tests/integration/tables/wmi_filter_consumer_binding.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(wmiFilterConsumerBinding, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"consumer", NormalType}
   //      {"filter", NormalType}
   //      {"class", NormalType}
diff --git a/tests/integration/tables/wmi_script_event_consumers.cpp b/tests/integration/tables/wmi_script_event_consumers.cpp
index b4ee4255..8ecc9c57 100644
--- a/tests/integration/tables/wmi_script_event_consumers.cpp
+++ b/tests/integration/tables/wmi_script_event_consumers.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(wmiScriptEventConsumers, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"scripting_engine", NormalType}
   //      {"script_file_name", NormalType}
diff --git a/tests/integration/tables/xprotect_entries.cpp b/tests/integration/tables/xprotect_entries.cpp
index 5a705016..fdd4b8f2 100644
--- a/tests/integration/tables/xprotect_entries.cpp
+++ b/tests/integration/tables/xprotect_entries.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(xprotectEntries, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"launch_type", NormalType}
   //      {"identity", NormalType}
diff --git a/tests/integration/tables/xprotect_meta.cpp b/tests/integration/tables/xprotect_meta.cpp
index b2ddf183..69c0419d 100644
--- a/tests/integration/tables/xprotect_meta.cpp
+++ b/tests/integration/tables/xprotect_meta.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(xprotectMeta, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"identifier", NormalType}
   //      {"type", NormalType}
   //      {"developer_id", NormalType}
diff --git a/tests/integration/tables/xprotect_reports.cpp b/tests/integration/tables/xprotect_reports.cpp
index 560ded4e..94d09bcb 100644
--- a/tests/integration/tables/xprotect_reports.cpp
+++ b/tests/integration/tables/xprotect_reports.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(xprotectReports, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"user_action", NormalType}
   //      {"time", NormalType}
diff --git a/tests/integration/tables/yara.cpp b/tests/integration/tables/yara.cpp
index 1fc46724..77496544 100644
--- a/tests/integration/tables/yara.cpp
+++ b/tests/integration/tables/yara.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(yara, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"path", NormalType}
   //      {"matches", NormalType}
   //      {"count", IntType}
diff --git a/tests/integration/tables/yara_events.cpp b/tests/integration/tables/yara_events.cpp
index 2c72978f..6ac1f670 100644
--- a/tests/integration/tables/yara_events.cpp
+++ b/tests/integration/tables/yara_events.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(yaraEvents, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"target_path", NormalType}
   //      {"category", NormalType}
   //      {"action", NormalType}
diff --git a/tests/integration/tables/yum_sources.cpp b/tests/integration/tables/yum_sources.cpp
index 4e16a0a8..fa174f59 100644
--- a/tests/integration/tables/yum_sources.cpp
+++ b/tests/integration/tables/yum_sources.cpp
@@ -1,4 +1,3 @@
-
 /**
  *  Copyright (c) 2014-present, Facebook, Inc.
  *  All rights reserved.
@@ -32,7 +31,7 @@ TEST_F(yumSources, test_sanity) {
   // 3. Build validation map
   // See helper.h for avaialbe flags
   // Or use custom DataCheck object
-  // ValidatatioMap row_map = {
+  // ValidationMap row_map = {
   //      {"name", NormalType}
   //      {"baseurl", NormalType}
   //      {"enabled", NormalType}