Cleanup and remove unmaintained mock tests

28 files changed, 55 insertions, 2933 deletions

diff --git a/test/arndaleboard.cc b/test/arndaleboard.cc
deleted file mode 100644
index 7a12e4c..0000000
--- a/test/arndaleboard.cc
+++ /dev/null
@@ -1,316 +0,0 @@
-#include <gtest/gtest.h>
-
-#include <cpuinfo.h>
-#include <cpuinfo-mock.h>
-
-
-TEST(PROCESSORS, count) {
-	ASSERT_EQ(2, cpuinfo_processors_count);
-}
-
-TEST(PROCESSORS, non_null) {
-	ASSERT_TRUE(cpuinfo_processors);
-}
-
-TEST(PROCESSORS, vendor) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_vendor_arm, cpuinfo_processors[i].vendor);
-	}
-}
-
-TEST(PROCESSORS, uarch) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_uarch_cortex_a15, cpuinfo_processors[i].uarch);
-	}
-}
-
-TEST(ISA, thumb) {
-	ASSERT_TRUE(cpuinfo_isa.thumb);
-}
-
-TEST(ISA, thumb2) {
-	ASSERT_TRUE(cpuinfo_isa.thumb2);
-}
-
-TEST(ISA, thumbee) {
-	ASSERT_FALSE(cpuinfo_isa.thumbee);
-}
-
-TEST(ISA, jazelle) {
-	ASSERT_FALSE(cpuinfo_isa.jazelle);
-}
-
-TEST(ISA, armv5e) {
-	ASSERT_TRUE(cpuinfo_isa.armv5e);
-}
-
-TEST(ISA, armv6) {
-	ASSERT_TRUE(cpuinfo_isa.armv6);
-}
-
-TEST(ISA, armv6k) {
-	ASSERT_TRUE(cpuinfo_isa.armv6k);
-}
-
-TEST(ISA, armv7) {
-	ASSERT_TRUE(cpuinfo_isa.armv7);
-}
-
-TEST(ISA, armv7mp) {
-	ASSERT_TRUE(cpuinfo_isa.armv7mp);
-}
-
-TEST(ISA, idiv) {
-	ASSERT_TRUE(cpuinfo_isa.idiv);
-}
-
-TEST(ISA, vfpv2) {
-	ASSERT_FALSE(cpuinfo_isa.vfpv2);
-}
-
-TEST(ISA, vfpv3) {
-	ASSERT_TRUE(cpuinfo_isa.vfpv3);
-}
-
-TEST(ISA, d32) {
-	ASSERT_TRUE(cpuinfo_isa.d32);
-}
-
-TEST(ISA, fp16) {
-	ASSERT_TRUE(cpuinfo_isa.fp16);
-}
-
-TEST(ISA, fma) {
-	ASSERT_TRUE(cpuinfo_isa.fma);
-}
-
-TEST(ISA, wmmx) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx);
-}
-
-TEST(ISA, wmmx2) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx2);
-}
-
-TEST(ISA, neon) {
-	ASSERT_TRUE(cpuinfo_isa.neon);
-}
-
-TEST(ISA, aes) {
-	ASSERT_FALSE(cpuinfo_isa.aes);
-}
-
-TEST(ISA, sha1) {
-	ASSERT_FALSE(cpuinfo_isa.sha1);
-}
-
-TEST(ISA, sha2) {
-	ASSERT_FALSE(cpuinfo_isa.sha2);
-}
-
-TEST(ISA, pmull) {
-	ASSERT_FALSE(cpuinfo_isa.pmull);
-}
-
-TEST(ISA, crc32) {
-	ASSERT_FALSE(cpuinfo_isa.crc32);
-}
-
-TEST(L1I, count) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_EQ(2, l1i.count);
-}
-
-TEST(L1I, non_null) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_TRUE(l1i.instances);
-}
-
-TEST(L1I, size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(32 * 1024, l1i.instances[k].size);
-	}
-}
-
-TEST(L1I, associativity) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(2, l1i.instances[k].associativity);
-	}
-}
-
-TEST(L1I, sets) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(256, l1i.instances[k].sets);
-	}
-}
-
-TEST(L1I, partitions) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(1, l1i.instances[k].partitions);
-	}
-}
-
-TEST(L1I, line_size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(64, l1i.instances[k].line_size);
-	}
-}
-
-TEST(L1I, flags) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(0, l1i.instances[k].flags);
-	}
-}
-
-TEST(L1I, processors) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(k, l1i.instances[k].processor_start);
-		ASSERT_EQ(1, l1i.instances[k].processor_count);
-	}
-}
-
-TEST(L1D, count) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_EQ(2, l1d.count);
-}
-
-TEST(L1D, non_null) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_TRUE(l1d.instances);
-}
-
-TEST(L1D, size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(32 * 1024, l1d.instances[k].size);
-	}
-}
-
-TEST(L1D, associativity) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(2, l1d.instances[k].associativity);
-	}
-}
-
-TEST(L1D, sets) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(256, l1d.instances[k].sets);
-	}
-}
-
-TEST(L1D, partitions) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(1, l1d.instances[k].partitions);
-	}
-}
-
-TEST(L1D, line_size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(64, l1d.instances[k].line_size);
-	}
-}
-
-TEST(L1D, flags) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(0, l1d.instances[k].flags);
-	}
-}
-
-TEST(L1D, processors) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(k, l1d.instances[k].processor_start);
-		ASSERT_EQ(1, l1d.instances[k].processor_count);
-	}
-}
-
-TEST(L2, count) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_EQ(1, l2.count);
-}
-
-TEST(L2, non_null) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_TRUE(l2.instances);
-}
-
-TEST(L2, size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(1024 * 1024, l2.instances[k].size);
-	}
-}
-
-TEST(L2, associativity) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(16, l2.instances[k].associativity);
-	}
-}
-
-TEST(L2, sets) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(1024, l2.instances[k].sets);
-	}
-}
-
-TEST(L2, partitions) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(1, l2.instances[k].partitions);
-	}
-}
-
-TEST(L2, line_size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(64, l2.instances[k].line_size);
-	}
-}
-
-TEST(L2, flags) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(0, l2.instances[k].flags);
-	}
-}
-
-TEST(L2, processors) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(0, l2.instances[k].processor_start);
-		ASSERT_EQ(2, l2.instances[k].processor_count);
-	}
-}
-
-TEST(L3, none) {
-	cpuinfo_caches l3 = cpuinfo_get_l3_cache();
-	ASSERT_EQ(0, l3.count);
-	ASSERT_FALSE(l3.instances);
-}
-
-TEST(L4, none) {
-	cpuinfo_caches l4 = cpuinfo_get_l4_cache();
-	ASSERT_EQ(0, l4.count);
-	ASSERT_FALSE(l4.instances);
-}
-
-int main(int argc, char* argv[]) {
-	cpuinfo_set_proc_cpuinfo_path("test/cpuinfo/arndaleboard.log");
-	cpuinfo_initialize();
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
diff --git a/test/beagleboard-xm.cc b/test/beagleboard-xm.cc
deleted file mode 100644
index 4811b04..0000000
--- a/test/beagleboard-xm.cc
+++ /dev/null
@@ -1,316 +0,0 @@
-#include <gtest/gtest.h>
-
-#include <cpuinfo.h>
-#include <cpuinfo-mock.h>
-
-
-TEST(PROCESSORS, count) {
-	ASSERT_EQ(1, cpuinfo_processors_count);
-}
-
-TEST(PROCESSORS, non_null) {
-	ASSERT_TRUE(cpuinfo_processors);
-}
-
-TEST(PROCESSORS, vendor) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_vendor_arm, cpuinfo_processors[i].vendor);
-	}
-}
-
-TEST(PROCESSORS, uarch) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_uarch_cortex_a8, cpuinfo_processors[i].uarch);
-	}
-}
-
-TEST(ISA, thumb) {
-	ASSERT_TRUE(cpuinfo_isa.thumb);
-}
-
-TEST(ISA, thumb2) {
-	ASSERT_TRUE(cpuinfo_isa.thumb2);
-}
-
-TEST(ISA, thumbee) {
-	ASSERT_TRUE(cpuinfo_isa.thumbee);
-}
-
-TEST(ISA, jazelle) {
-	ASSERT_FALSE(cpuinfo_isa.jazelle);
-}
-
-TEST(ISA, armv5e) {
-	ASSERT_TRUE(cpuinfo_isa.armv5e);
-}
-
-TEST(ISA, armv6) {
-	ASSERT_TRUE(cpuinfo_isa.armv6);
-}
-
-TEST(ISA, armv6k) {
-	ASSERT_TRUE(cpuinfo_isa.armv6k);
-}
-
-TEST(ISA, armv7) {
-	ASSERT_TRUE(cpuinfo_isa.armv7);
-}
-
-TEST(ISA, armv7mp) {
-	ASSERT_FALSE(cpuinfo_isa.armv7mp);
-}
-
-TEST(ISA, idiv) {
-	ASSERT_FALSE(cpuinfo_isa.idiv);
-}
-
-TEST(ISA, vfpv2) {
-	ASSERT_FALSE(cpuinfo_isa.vfpv2);
-}
-
-TEST(ISA, vfpv3) {
-	ASSERT_TRUE(cpuinfo_isa.vfpv3);
-}
-
-TEST(ISA, d32) {
-	ASSERT_TRUE(cpuinfo_isa.d32);
-}
-
-TEST(ISA, fp16) {
-	ASSERT_FALSE(cpuinfo_isa.fp16);
-}
-
-TEST(ISA, fma) {
-	ASSERT_FALSE(cpuinfo_isa.fma);
-}
-
-TEST(ISA, wmmx) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx);
-}
-
-TEST(ISA, wmmx2) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx2);
-}
-
-TEST(ISA, neon) {
-	ASSERT_TRUE(cpuinfo_isa.neon);
-}
-
-TEST(ISA, aes) {
-	ASSERT_FALSE(cpuinfo_isa.aes);
-}
-
-TEST(ISA, sha1) {
-	ASSERT_FALSE(cpuinfo_isa.sha1);
-}
-
-TEST(ISA, sha2) {
-	ASSERT_FALSE(cpuinfo_isa.sha2);
-}
-
-TEST(ISA, pmull) {
-	ASSERT_FALSE(cpuinfo_isa.pmull);
-}
-
-TEST(ISA, crc32) {
-	ASSERT_FALSE(cpuinfo_isa.crc32);
-}
-
-TEST(L1I, count) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_EQ(1, l1i.count);
-}
-
-TEST(L1I, non_null) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_TRUE(l1i.instances);
-}
-
-TEST(L1I, size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(32 * 1024, l1i.instances[k].size);
-	}
-}
-
-TEST(L1I, associativity) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(4, l1i.instances[k].associativity);
-	}
-}
-
-TEST(L1I, sets) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(128, l1i.instances[k].sets);
-	}
-}
-
-TEST(L1I, partitions) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(1, l1i.instances[k].partitions);
-	}
-}
-
-TEST(L1I, line_size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(64, l1i.instances[k].line_size);
-	}
-}
-
-TEST(L1I, flags) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(0, l1i.instances[k].flags);
-	}
-}
-
-TEST(L1I, processors) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(k, l1i.instances[k].processor_start);
-		ASSERT_EQ(1, l1i.instances[k].processor_count);
-	}
-}
-
-TEST(L1D, count) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_EQ(1, l1d.count);
-}
-
-TEST(L1D, non_null) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_TRUE(l1d.instances);
-}
-
-TEST(L1D, size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(32 * 1024, l1d.instances[k].size);
-	}
-}
-
-TEST(L1D, associativity) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(4, l1d.instances[k].associativity);
-	}
-}
-
-TEST(L1D, sets) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(128, l1d.instances[k].sets);
-	}
-}
-
-TEST(L1D, partitions) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(1, l1d.instances[k].partitions);
-	}
-}
-
-TEST(L1D, line_size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(64, l1d.instances[k].line_size);
-	}
-}
-
-TEST(L1D, flags) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(0, l1d.instances[k].flags);
-	}
-}
-
-TEST(L1D, processors) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(k, l1d.instances[k].processor_start);
-		ASSERT_EQ(1, l1d.instances[k].processor_count);
-	}
-}
-
-TEST(L2, count) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_EQ(1, l2.count);
-}
-
-TEST(L2, non_null) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_TRUE(l2.instances);
-}
-
-TEST(L2, size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(256 * 1024, l2.instances[k].size);
-	}
-}
-
-TEST(L2, associativity) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(8, l2.instances[k].associativity);
-	}
-}
-
-TEST(L2, sets) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(512, l2.instances[k].sets);
-	}
-}
-
-TEST(L2, partitions) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(1, l2.instances[k].partitions);
-	}
-}
-
-TEST(L2, line_size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(64, l2.instances[k].line_size);
-	}
-}
-
-TEST(L2, flags) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(0, l2.instances[k].flags);
-	}
-}
-
-TEST(L2, processors) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(0, l2.instances[k].processor_start);
-		ASSERT_EQ(1, l2.instances[k].processor_count);
-	}
-}
-
-TEST(L3, none) {
-	cpuinfo_caches l3 = cpuinfo_get_l3_cache();
-	ASSERT_EQ(0, l3.count);
-	ASSERT_FALSE(l3.instances);
-}
-
-TEST(L4, none) {
-	cpuinfo_caches l4 = cpuinfo_get_l4_cache();
-	ASSERT_EQ(0, l4.count);
-	ASSERT_FALSE(l4.instances);
-}
-
-int main(int argc, char* argv[]) {
-	cpuinfo_set_proc_cpuinfo_path("test/cpuinfo/beagleboard-xm.log");
-	cpuinfo_initialize();
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
diff --git a/test/build.prop/galaxy-s6-us.log b/test/build.prop/galaxy-s6-us.log
deleted file mode 100644
index 01a07e4..0000000
--- a/test/build.prop/galaxy-s6-us.log
+++ /dev/null
@@ -1,165 +0,0 @@
-
-# begin build properties
-# autogenerated by buildinfo.sh
-ro.build.id=LMY47X
-ro.build.display.id=LMY47X.G920AUCU3BOJ7
-ro.build.version.incremental=G920AUCU3BOJ7
-ro.build.version.sdk=22
-ro.build.version.codename=REL
-ro.build.version.all_codenames=REL
-ro.build.version.release=5.1.1
-ro.build.date=Thu Oct 22 19:15:54 KST 2015
-ro.build.date.utc=1445508954
-ro.build.type=user
-ro.build.user=dpi
-ro.build.host=SWDD6820
-ro.build.tags=release-keys
-ro.build.flavor=zeroflteuc-user
-ro.product.model=SAMSUNG-SM-G920A
-ro.product.brand=samsung
-ro.product.name=zeroflteuc
-ro.product.device=zeroflteatt
-ro.product.board=universal7420
-# ro.product.cpu.abi and ro.product.cpu.abi2 are obsolete,
-# use ro.product.cpu.abilist instead.
-ro.product.cpu.abi=arm64-v8a
-ro.product.cpu.abilist=arm64-v8a,armeabi-v7a,armeabi
-ro.product.cpu.abilist32=armeabi-v7a,armeabi
-ro.product.cpu.abilist64=arm64-v8a
-ro.product.manufacturer=samsung
-ro.product.locale.language=en
-ro.product.locale.region=US
-ro.wifi.channels=
-ro.board.platform=exynos5
-# ro.build.product is obsolete; use ro.product.device
-ro.build.product=zeroflteatt
-# Do not try to parse description, fingerprint, or thumbprint
-ro.build.description=zeroflteuc-user 5.1.1 LMY47X G920AUCU3BOJ7 release-keys
-ro.build.fingerprint=samsung/zeroflteuc/zeroflteatt:5.1.1/LMY47X/G920AUCU3BOJ7:user/release-keys
-ro.build.characteristics=att
-# Samsung Specific Properties
-ro.build.PDA=G920AUCU3BOJ7
-ro.build.hidden_ver=G920AUCU3BOJ7
-ro.config.rm_preload_enabled=0
-ro.build.changelist=5927475
-ro.product_ship=true
-ro.chipname=exynos7420
-# end build properties
-
-#
-# HWUI_BUILD_PROPERTIES
-#
-ro.hwui.texture_cache_size=88
-ro.hwui.layer_cache_size=58
-ro.hwui.path_cache_size=16
-ro.hwui.shape_cache_size=4
-ro.hwui.gradient_cache_size=2
-ro.hwui.drop_shadow_cache_size=8
-ro.hwui.r_buffer_cache_size=4
-ro.hwui.text_small_cache_width=2048
-ro.hwui.text_small_cache_height=2048
-ro.hwui.text_large_cache_width=4096
-ro.hwui.text_large_cache_height=4096
-ro.hwui.fbo_cache_size=16
-#
-# from device/samsung/zeroflteatt/system.prop
-#
-#
-# system.prop for universal7420
-#
-ro.sf.lcd_density=640
-
-ro.arch=exynos7420
-persist.demo.hdmirotationlock=false
-ro.zygote.disable_gl_preload=1
-
-ro.sf.lcd_density=640
-
-# Multimedia property for Smart View
-media.enable-commonsource=true
-
-# Multimedia property for Camcorder Recording
-media.sfrec.adj_frames=2
-
-# SAMPOo
-sys.config.spcm_enable=true
-sys.config.spcm_preload_enable=true
-
-#
-# ADDITIONAL_BUILD_PROPERTIES
-#
-ro.astcenc.astcsupport=1
-ro.config.tima=1
-ro.config.timaversion=3.0
-ro.config.ringtone=ATT_Firefly_Default.ogg
-ro.config.notification_sound=Whisper.ogg
-ro.config.alarm_alert=Morning_Flower.ogg
-ro.config.media_sound=Media_preview_Touch_the_light.ogg
-ro.config.ringtone_2=Basic_Bell.ogg
-ro.config.notification_sound_2=S_Charming_Bell.ogg
-dalvik.vm.heapstartsize=8m
-dalvik.vm.heapgrowthlimit=256m
-dalvik.vm.heapsize=512m
-dalvik.vm.heaptargetutilization=0.75
-dalvik.vm.heapminfree=2m
-dalvik.vm.heapmaxfree=8m
-ro.opengles.version=196609
-ro.sf.lcd_density=480
-debug.hwc.force_gpu=0
-debug.hwc.nodirtyregion=0
-debug.hwc.winupdate=1
-drm.service.enabled=true
-ro.hdcp2.rx=tz
-ro.secwvk=220
-ro.securestorage.support=true
-ro.build.scafe=capuccino
-ro.build.scafe.size=short
-ro.build.scafe.shot=single
-ro.build.scafe.cream=white
-ro.sec.fle.encryption=false
-ro.im.param.offset=7341648
-ro.me.param.offset=7341728
-ro.sn.param.offset=7341808
-ro.pr.param.offset=7341888
-ro.sku.param.offset=7341968
-security.mdpp=None
-ro.security.mdpp.ver=2.0
-ro.security.mdpp.release=3
-ro.security.vpnpp.ver=1.4
-ro.security.vpnpp.release=5.2
-security.mdpp.result=None
-ro.error.receiver.default=com.samsung.receiver.error
-ro.config.dha_cached_min=4
-ro.config.dha_empty_min=8
-ro.config.dha_lmk_scale=1.909
-config.disable_atlas=true
-sys.config.samp_oak_enable=false
-sys.config.samp_oakoom_enable=false
-ro.security.mdpp.ux=Enabled
-ro.security.reactive.active=2
-keyguard.no_require_sim=true
-ro.com.android.dateformat=MM-dd-yyyy
-ro.carrier=unknown
-ro.com.google.clientidbase=android-samsung
-ro.security.icd.flagmode=multi
-ro.ril.hsxpa=1
-ro.ril.gprsclass=10
-ro.adb.qemud=1
-ro.setupwizard.mode=DISABLED
-ro.com.google.clientidbase.ms=android-att-us
-ro.com.google.clientidbase.am=android-att-us
-ro.com.google.clientidbase.yt=android-samsung
-ro.com.google.clientidbase.gmm=android-samsung
-ro.com.google.gmsversion=5.1_r2
-persist.sys.dalvik.vm.lib.2=libart.so
-ro.build.selinux=1
-dalvik.vm.isa.arm64.features=default
-dalvik.vm.isa.arm.features=div
-ro.config.knox=v30
-ro.kernel.qemu=0
-dalvik.vm.dexopt-flags=m=y
-net.bt.name=Android
-dalvik.vm.stack-trace-file=/data/anr/traces.txt
-ro.build.aapt.config.prefer=xxxhdpi
-ro.build.version.sdl=2201
-
diff --git a/test/galaxy-c9-pro.cc b/test/galaxy-c9-pro.cc
index 2758a4f..0e61246 100644
--- a/test/galaxy-c9-pro.cc
+++ b/test/galaxy-c9-pro.cc
@@ -389,6 +389,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/galaxy-grand-prime-value-edition.cc b/test/galaxy-grand-prime-value-edition.cc
index d4392c3..1ded008 100644
--- a/test/galaxy-grand-prime-value-edition.cc
+++ b/test/galaxy-grand-prime-value-edition.cc
@@ -315,6 +315,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/galaxy-nexus.cc b/test/galaxy-nexus.cc
deleted file mode 100644
index 0b0d938..0000000
--- a/test/galaxy-nexus.cc
+++ /dev/null
@@ -1,319 +0,0 @@
-#include <gtest/gtest.h>
-
-#include <cpuinfo.h>
-#include <cpuinfo-mock.h>
-
-
-TEST(PROCESSORS, count) {
-	ASSERT_EQ(2, cpuinfo_processors_count);
-}
-
-TEST(PROCESSORS, non_null) {
-	ASSERT_TRUE(cpuinfo_processors);
-}
-
-TEST(PROCESSORS, vendor) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_vendor_arm, cpuinfo_processors[i].vendor);
-	}
-}
-
-TEST(PROCESSORS, uarch) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_uarch_cortex_a9, cpuinfo_processors[i].uarch);
-	}
-}
-
-TEST(ISA, thumb) {
-	ASSERT_TRUE(cpuinfo_isa.thumb);
-}
-
-TEST(ISA, thumb2) {
-	ASSERT_TRUE(cpuinfo_isa.thumb2);
-}
-
-TEST(ISA, thumbee) {
-	ASSERT_TRUE(cpuinfo_isa.thumbee);
-}
-
-TEST(ISA, jazelle) {
-	ASSERT_FALSE(cpuinfo_isa.jazelle);
-}
-
-TEST(ISA, armv5e) {
-	ASSERT_TRUE(cpuinfo_isa.armv5e);
-}
-
-TEST(ISA, armv6) {
-	ASSERT_TRUE(cpuinfo_isa.armv6);
-}
-
-TEST(ISA, armv6k) {
-	ASSERT_TRUE(cpuinfo_isa.armv6k);
-}
-
-TEST(ISA, armv7) {
-	ASSERT_TRUE(cpuinfo_isa.armv7);
-}
-
-TEST(ISA, armv7mp) {
-	ASSERT_TRUE(cpuinfo_isa.armv7mp);
-}
-
-TEST(ISA, idiv) {
-	ASSERT_FALSE(cpuinfo_isa.idiv);
-}
-
-TEST(ISA, vfpv2) {
-	ASSERT_FALSE(cpuinfo_isa.vfpv2);
-}
-
-TEST(ISA, vfpv3) {
-	ASSERT_TRUE(cpuinfo_isa.vfpv3);
-}
-
-TEST(ISA, d32) {
-	ASSERT_TRUE(cpuinfo_isa.d32);
-}
-
-TEST(ISA, fp16) {
-	ASSERT_TRUE(cpuinfo_isa.fp16);
-}
-
-TEST(ISA, fma) {
-	ASSERT_FALSE(cpuinfo_isa.fma);
-}
-
-TEST(ISA, wmmx) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx);
-}
-
-TEST(ISA, wmmx2) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx2);
-}
-
-TEST(ISA, neon) {
-	ASSERT_TRUE(cpuinfo_isa.neon);
-}
-
-TEST(ISA, aes) {
-	ASSERT_FALSE(cpuinfo_isa.aes);
-}
-
-TEST(ISA, sha1) {
-	ASSERT_FALSE(cpuinfo_isa.sha1);
-}
-
-TEST(ISA, sha2) {
-	ASSERT_FALSE(cpuinfo_isa.sha2);
-}
-
-TEST(ISA, pmull) {
-	ASSERT_FALSE(cpuinfo_isa.pmull);
-}
-
-TEST(ISA, crc32) {
-	ASSERT_FALSE(cpuinfo_isa.crc32);
-}
-
-TEST(L1I, count) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_EQ(2, l1i.count);
-}
-
-TEST(L1I, non_null) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_TRUE(l1i.instances);
-}
-
-TEST(L1I, size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(32 * 1024, l1i.instances[k].size);
-	}
-}
-
-TEST(L1I, associativity) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(4, l1i.instances[k].associativity);
-	}
-}
-
-TEST(L1I, sets) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(l1i.instances[k].size,
-			l1i.instances[k].sets * l1i.instances[k].line_size * l1i.instances[k].partitions * l1i.instances[k].associativity);
-	}
-}
-
-TEST(L1I, partitions) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(1, l1i.instances[k].partitions);
-	}
-}
-
-TEST(L1I, line_size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(32, l1i.instances[k].line_size);
-	}
-}
-
-TEST(L1I, flags) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(0, l1i.instances[k].flags);
-	}
-}
-
-TEST(L1I, processors) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(k, l1i.instances[k].processor_start);
-		ASSERT_EQ(1, l1i.instances[k].processor_count);
-	}
-}
-
-TEST(L1D, count) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_EQ(2, l1d.count);
-}
-
-TEST(L1D, non_null) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_TRUE(l1d.instances);
-}
-
-TEST(L1D, size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(32 * 1024, l1d.instances[k].size);
-	}
-}
-
-TEST(L1D, associativity) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(4, l1d.instances[k].associativity);
-	}
-}
-
-TEST(L1D, sets) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(l1d.instances[k].size,
-			l1d.instances[k].sets * l1d.instances[k].line_size * l1d.instances[k].partitions * l1d.instances[k].associativity);
-	}
-}
-
-TEST(L1D, partitions) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(1, l1d.instances[k].partitions);
-	}
-}
-
-TEST(L1D, line_size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(32, l1d.instances[k].line_size);
-	}
-}
-
-TEST(L1D, flags) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(0, l1d.instances[k].flags);
-	}
-}
-
-TEST(L1D, processors) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(k, l1d.instances[k].processor_start);
-		ASSERT_EQ(1, l1d.instances[k].processor_count);
-	}
-}
-
-TEST(L2, count) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_EQ(1, l2.count);
-}
-
-TEST(L2, non_null) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_TRUE(l2.instances);
-}
-
-TEST(L2, size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(1024 * 1024, l2.instances[k].size);
-	}
-}
-
-TEST(L2, associativity) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(16, l2.instances[k].associativity);
-	}
-}
-
-TEST(L2, sets) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(l2.instances[k].size,
-			l2.instances[k].sets * l2.instances[k].line_size * l2.instances[k].partitions * l2.instances[k].associativity);
-	}
-}
-
-TEST(L2, partitions) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(1, l2.instances[k].partitions);
-	}
-}
-
-TEST(L2, line_size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(32, l2.instances[k].line_size);
-	}
-}
-
-TEST(L2, flags) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(0, l2.instances[k].flags);
-	}
-}
-
-TEST(L2, processors) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(0, l2.instances[k].processor_start);
-		ASSERT_EQ(2, l2.instances[k].processor_count);
-	}
-}
-
-TEST(L3, none) {
-	cpuinfo_caches l3 = cpuinfo_get_l3_cache();
-	ASSERT_EQ(0, l3.count);
-	ASSERT_FALSE(l3.instances);
-}
-
-TEST(L4, none) {
-	cpuinfo_caches l4 = cpuinfo_get_l4_cache();
-	ASSERT_EQ(0, l4.count);
-	ASSERT_FALSE(l4.instances);
-}
-
-int main(int argc, char* argv[]) {
-	cpuinfo_set_proc_cpuinfo_path("test/cpuinfo/galaxy-nexus.log");
-	cpuinfo_initialize();
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
diff --git a/test/galaxy-s6.cc b/test/galaxy-s6.cc
index 8d59f9b..aca0839 100644
--- a/test/galaxy-s6.cc
+++ b/test/galaxy-s6.cc
@@ -389,6 +389,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/galaxy-s8-us.cc b/test/galaxy-s8-us.cc
index 46f4d23..ffff546 100644
--- a/test/galaxy-s8-us.cc
+++ b/test/galaxy-s8-us.cc
@@ -402,6 +402,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/huawei-p9-lite.cc b/test/huawei-p9-lite.cc
index 066bfeb..7a9a3f4 100644
--- a/test/huawei-p9-lite.cc
+++ b/test/huawei-p9-lite.cc
@@ -323,6 +323,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/jetson-tx1.cc b/test/jetson-tx1.cc
deleted file mode 100644
index 573f349..0000000
--- a/test/jetson-tx1.cc
+++ /dev/null
@@ -1,340 +0,0 @@
-#include <gtest/gtest.h>
-
-#include <cpuinfo.h>
-#include <cpuinfo-mock.h>
-
-
-TEST(PROCESSORS, count) {
-	ASSERT_EQ(4, cpuinfo_processors_count);
-}
-
-TEST(PROCESSORS, non_null) {
-	ASSERT_TRUE(cpuinfo_processors);
-}
-
-TEST(PROCESSORS, vendor) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_vendor_arm, cpuinfo_processors[i].vendor);
-	}
-}
-
-TEST(PROCESSORS, uarch) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_uarch_cortex_a57, cpuinfo_processors[i].uarch);
-	}
-}
-
-#if CPUINFO_ARCH_ARM
-TEST(ISA, thumb) {
-	ASSERT_TRUE(cpuinfo_isa.thumb);
-}
-
-TEST(ISA, thumb2) {
-	ASSERT_TRUE(cpuinfo_isa.thumb2);
-}
-
-TEST(ISA, thumbee) {
-	ASSERT_FALSE(cpuinfo_isa.thumbee);
-}
-
-TEST(ISA, jazelle) {
-	ASSERT_FALSE(cpuinfo_isa.jazelle);
-}
-
-TEST(ISA, armv5e) {
-	ASSERT_TRUE(cpuinfo_isa.armv5e);
-}
-
-TEST(ISA, armv6) {
-	ASSERT_TRUE(cpuinfo_isa.armv6);
-}
-
-TEST(ISA, armv6k) {
-	ASSERT_TRUE(cpuinfo_isa.armv6k);
-}
-
-TEST(ISA, armv7) {
-	ASSERT_TRUE(cpuinfo_isa.armv7);
-}
-
-TEST(ISA, armv7mp) {
-	ASSERT_TRUE(cpuinfo_isa.armv7mp);
-}
-
-TEST(ISA, idiv) {
-	ASSERT_TRUE(cpuinfo_isa.idiv);
-}
-
-TEST(ISA, vfpv2) {
-	ASSERT_FALSE(cpuinfo_isa.vfpv2);
-}
-
-TEST(ISA, vfpv3) {
-	ASSERT_TRUE(cpuinfo_isa.vfpv3);
-}
-
-TEST(ISA, d32) {
-	ASSERT_TRUE(cpuinfo_isa.d32);
-}
-
-TEST(ISA, fp16) {
-	ASSERT_TRUE(cpuinfo_isa.fp16);
-}
-
-TEST(ISA, fma) {
-	ASSERT_TRUE(cpuinfo_isa.fma);
-}
-
-TEST(ISA, wmmx) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx);
-}
-
-TEST(ISA, wmmx2) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx2);
-}
-
-TEST(ISA, neon) {
-	ASSERT_TRUE(cpuinfo_isa.neon);
-}
-#endif /* CPUINFO_ARCH_ARM */
-
-TEST(ISA, aes) {
-	ASSERT_TRUE(cpuinfo_isa.aes);
-}
-
-TEST(ISA, sha1) {
-	ASSERT_TRUE(cpuinfo_isa.sha1);
-}
-
-TEST(ISA, sha2) {
-	ASSERT_TRUE(cpuinfo_isa.sha2);
-}
-
-TEST(ISA, pmull) {
-	ASSERT_TRUE(cpuinfo_isa.pmull);
-}
-
-TEST(ISA, crc32) {
-	ASSERT_TRUE(cpuinfo_isa.crc32);
-}
-
-TEST(L1I, count) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_EQ(4, l1i.count);
-}
-
-#if CPUINFO_ARCH_ARM64
-TEST(ISA, atomics) {
-	ASSERT_FALSE(cpuinfo_isa.atomics);
-}
-
-TEST(ISA, rdm) {
-	ASSERT_FALSE(cpuinfo_isa.rdm);
-}
-
-TEST(ISA, fp16arith) {
-	ASSERT_FALSE(cpuinfo_isa.fp16arith);
-}
-
-TEST(ISA, jscvt) {
-	ASSERT_FALSE(cpuinfo_isa.jscvt);
-}
-
-TEST(ISA, fcma) {
-	ASSERT_FALSE(cpuinfo_isa.fcma);
-}
-#endif /* CPUINFO_ARCH_ARM64 */
-
-TEST(L1I, non_null) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_TRUE(l1i.instances);
-}
-
-TEST(L1I, size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(48 * 1024, l1i.instances[k].size);
-	}
-}
-
-TEST(L1I, associativity) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(3, l1i.instances[k].associativity);
-	}
-}
-
-TEST(L1I, sets) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(256, l1i.instances[k].sets);
-	}
-}
-
-TEST(L1I, partitions) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(1, l1i.instances[k].partitions);
-	}
-}
-
-TEST(L1I, line_size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(64, l1i.instances[k].line_size);
-	}
-}
-
-TEST(L1I, flags) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(0, l1i.instances[k].flags);
-	}
-}
-
-TEST(L1I, processors) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(k, l1i.instances[k].processor_start);
-		ASSERT_EQ(1, l1i.instances[k].processor_count);
-	}
-}
-
-TEST(L1D, count) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_EQ(4, l1d.count);
-}
-
-TEST(L1D, non_null) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_TRUE(l1d.instances);
-}
-
-TEST(L1D, size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(32 * 1024, l1d.instances[k].size);
-	}
-}
-
-TEST(L1D, associativity) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(2, l1d.instances[k].associativity);
-	}
-}
-
-TEST(L1D, sets) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(256, l1d.instances[k].sets);
-	}
-}
-
-TEST(L1D, partitions) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(1, l1d.instances[k].partitions);
-	}
-}
-
-TEST(L1D, line_size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(64, l1d.instances[k].line_size);
-	}
-}
-
-TEST(L1D, flags) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(0, l1d.instances[k].flags);
-	}
-}
-
-TEST(L1D, processors) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(k, l1d.instances[k].processor_start);
-		ASSERT_EQ(1, l1d.instances[k].processor_count);
-	}
-}
-
-TEST(L2, count) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_EQ(1, l2.count);
-}
-
-TEST(L2, non_null) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_TRUE(l2.instances);
-}
-
-TEST(L2, size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(2 * 1024 * 1024, l2.instances[k].size);
-	}
-}
-
-TEST(L2, associativity) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(16, l2.instances[k].associativity);
-	}
-}
-
-TEST(L2, sets) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(2048, l2.instances[k].sets);
-	}
-}
-
-TEST(L2, partitions) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(1, l2.instances[k].partitions);
-	}
-}
-
-TEST(L2, line_size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(64, l2.instances[k].line_size);
-	}
-}
-
-TEST(L2, flags) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(CPUINFO_CACHE_INCLUSIVE, l2.instances[k].flags);
-	}
-}
-
-TEST(L2, processors) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(0, l2.instances[k].processor_start);
-		ASSERT_EQ(4, l2.instances[k].processor_count);
-	}
-}
-
-TEST(L3, none) {
-	cpuinfo_caches l3 = cpuinfo_get_l3_cache();
-	ASSERT_EQ(0, l3.count);
-	ASSERT_FALSE(l3.instances);
-}
-
-TEST(L4, none) {
-	cpuinfo_caches l4 = cpuinfo_get_l4_cache();
-	ASSERT_EQ(0, l4.count);
-	ASSERT_FALSE(l4.instances);
-}
-
-int main(int argc, char* argv[]) {
-	cpuinfo_set_proc_cpuinfo_path("test/cpuinfo/jetson-tx1.log");
-	cpuinfo_initialize();
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
diff --git a/test/lg-k10-eu.cc b/test/lg-k10-eu.cc
index b0d0793..8e2afdf 100644
--- a/test/lg-k10-eu.cc
+++ b/test/lg-k10-eu.cc
@@ -315,6 +315,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/meizu-pro-6s.cc b/test/meizu-pro-6s.cc
index de315e8..a7bb434 100644
--- a/test/meizu-pro-6s.cc
+++ b/test/meizu-pro-6s.cc
@@ -418,6 +418,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/moto-g-gen2.cc b/test/moto-g-gen2.cc
index a0bc9b0..bb9cf37 100644
--- a/test/moto-g-gen2.cc
+++ b/test/moto-g-gen2.cc
@@ -315,6 +315,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/nexus-s.cc b/test/nexus-s.cc
index 90be066..079beb0 100644
--- a/test/nexus-s.cc
+++ b/test/nexus-s.cc
@@ -246,7 +246,7 @@ TEST(L2, non_null) {
 	ASSERT_TRUE(l2.instances);
 }
 
-TEST(L2, DISABLED_size) {
+TEST(L2, size) {
 	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
 	for (uint32_t k = 0; k < l2.count; k++) {
 		ASSERT_EQ(512 * 1024, l2.instances[k].size);
@@ -260,10 +260,11 @@ TEST(L2, associativity) {
 	}
 }
 
-TEST(L2, DISABLED_sets) {
+TEST(L2, sets) {
 	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
 	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(1024, l2.instances[k].sets);
+		ASSERT_EQ(l2.instances[k].size,
+			l2.instances[k].sets * l2.instances[k].line_size * l2.instances[k].partitions * l2.instances[k].associativity);
 	}
 }
 
diff --git a/test/nexus4.cc b/test/nexus4.cc
index f113259..f644b35 100644
--- a/test/nexus4.cc
+++ b/test/nexus4.cc
@@ -315,6 +315,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/nexus5x.cc b/test/nexus5x.cc
index 037b622..26e9c3b 100644
--- a/test/nexus5x.cc
+++ b/test/nexus5x.cc
@@ -381,6 +381,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/nexus6.cc b/test/nexus6.cc
index ffd4b99..e6c13f5 100644
--- a/test/nexus6.cc
+++ b/test/nexus6.cc
@@ -315,6 +315,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/nexus6p.cc b/test/nexus6p.cc
index eaa9512..6c054b9 100644
--- a/test/nexus6p.cc
+++ b/test/nexus6p.cc
@@ -389,6 +389,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/nexus9.cc b/test/nexus9.cc
index ad90d82..346ee26 100644
--- a/test/nexus9.cc
+++ b/test/nexus9.cc
@@ -339,6 +339,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/pandaboard-es.cc b/test/pandaboard-es.cc
deleted file mode 100644
index d2b98a2..0000000
--- a/test/pandaboard-es.cc
+++ /dev/null
@@ -1,316 +0,0 @@
-#include <gtest/gtest.h>
-
-#include <cpuinfo.h>
-#include <cpuinfo-mock.h>
-
-
-TEST(PROCESSORS, count) {
-	ASSERT_EQ(2, cpuinfo_processors_count);
-}
-
-TEST(PROCESSORS, non_null) {
-	ASSERT_TRUE(cpuinfo_processors);
-}
-
-TEST(PROCESSORS, vendor) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_vendor_arm, cpuinfo_processors[i].vendor);
-	}
-}
-
-TEST(PROCESSORS, uarch) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_uarch_cortex_a9, cpuinfo_processors[i].uarch);
-	}
-}
-
-TEST(ISA, thumb) {
-	ASSERT_TRUE(cpuinfo_isa.thumb);
-}
-
-TEST(ISA, thumb2) {
-	ASSERT_TRUE(cpuinfo_isa.thumb2);
-}
-
-TEST(ISA, thumbee) {
-	ASSERT_TRUE(cpuinfo_isa.thumbee);
-}
-
-TEST(ISA, jazelle) {
-	ASSERT_FALSE(cpuinfo_isa.jazelle);
-}
-
-TEST(ISA, armv5e) {
-	ASSERT_TRUE(cpuinfo_isa.armv5e);
-}
-
-TEST(ISA, armv6) {
-	ASSERT_TRUE(cpuinfo_isa.armv6);
-}
-
-TEST(ISA, armv6k) {
-	ASSERT_TRUE(cpuinfo_isa.armv6k);
-}
-
-TEST(ISA, armv7) {
-	ASSERT_TRUE(cpuinfo_isa.armv7);
-}
-
-TEST(ISA, armv7mp) {
-	ASSERT_TRUE(cpuinfo_isa.armv7mp);
-}
-
-TEST(ISA, idiv) {
-	ASSERT_FALSE(cpuinfo_isa.idiv);
-}
-
-TEST(ISA, vfpv2) {
-	ASSERT_FALSE(cpuinfo_isa.vfpv2);
-}
-
-TEST(ISA, vfpv3) {
-	ASSERT_TRUE(cpuinfo_isa.vfpv3);
-}
-
-TEST(ISA, d32) {
-	ASSERT_TRUE(cpuinfo_isa.d32);
-}
-
-TEST(ISA, fp16) {
-	ASSERT_TRUE(cpuinfo_isa.fp16);
-}
-
-TEST(ISA, fma) {
-	ASSERT_FALSE(cpuinfo_isa.fma);
-}
-
-TEST(ISA, wmmx) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx);
-}
-
-TEST(ISA, wmmx2) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx2);
-}
-
-TEST(ISA, neon) {
-	ASSERT_TRUE(cpuinfo_isa.neon);
-}
-
-TEST(ISA, aes) {
-	ASSERT_FALSE(cpuinfo_isa.aes);
-}
-
-TEST(ISA, sha1) {
-	ASSERT_FALSE(cpuinfo_isa.sha1);
-}
-
-TEST(ISA, sha2) {
-	ASSERT_FALSE(cpuinfo_isa.sha2);
-}
-
-TEST(ISA, pmull) {
-	ASSERT_FALSE(cpuinfo_isa.pmull);
-}
-
-TEST(ISA, crc32) {
-	ASSERT_FALSE(cpuinfo_isa.crc32);
-}
-
-TEST(L1I, count) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_EQ(2, l1i.count);
-}
-
-TEST(L1I, non_null) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_TRUE(l1i.instances);
-}
-
-TEST(L1I, size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(32 * 1024, l1i.instances[k].size);
-	}
-}
-
-TEST(L1I, associativity) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(4, l1i.instances[k].associativity);
-	}
-}
-
-TEST(L1I, sets) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(256, l1i.instances[k].sets);
-	}
-}
-
-TEST(L1I, partitions) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(1, l1i.instances[k].partitions);
-	}
-}
-
-TEST(L1I, line_size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(32, l1i.instances[k].line_size);
-	}
-}
-
-TEST(L1I, flags) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(0, l1i.instances[k].flags);
-	}
-}
-
-TEST(L1I, processors) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(k, l1i.instances[k].processor_start);
-		ASSERT_EQ(1, l1i.instances[k].processor_count);
-	}
-}
-
-TEST(L1D, count) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_EQ(2, l1d.count);
-}
-
-TEST(L1D, non_null) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_TRUE(l1d.instances);
-}
-
-TEST(L1D, size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(32 * 1024, l1d.instances[k].size);
-	}
-}
-
-TEST(L1D, associativity) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(4, l1d.instances[k].associativity);
-	}
-}
-
-TEST(L1D, sets) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(256, l1d.instances[k].sets);
-	}
-}
-
-TEST(L1D, partitions) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(1, l1d.instances[k].partitions);
-	}
-}
-
-TEST(L1D, line_size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(32, l1d.instances[k].line_size);
-	}
-}
-
-TEST(L1D, flags) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(0, l1d.instances[k].flags);
-	}
-}
-
-TEST(L1D, processors) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(k, l1d.instances[k].processor_start);
-		ASSERT_EQ(1, l1d.instances[k].processor_count);
-	}
-}
-
-TEST(L2, count) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_EQ(1, l2.count);
-}
-
-TEST(L2, non_null) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_TRUE(l2.instances);
-}
-
-TEST(L2, size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(1024 * 1024, l2.instances[k].size);
-	}
-}
-
-TEST(L2, associativity) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(16, l2.instances[k].associativity);
-	}
-}
-
-TEST(L2, sets) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(2048, l2.instances[k].sets);
-	}
-}
-
-TEST(L2, partitions) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(1, l2.instances[k].partitions);
-	}
-}
-
-TEST(L2, line_size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(32, l2.instances[k].line_size);
-	}
-}
-
-TEST(L2, flags) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(0, l2.instances[k].flags);
-	}
-}
-
-TEST(L2, processors) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(0, l2.instances[k].processor_start);
-		ASSERT_EQ(2, l2.instances[k].processor_count);
-	}
-}
-
-TEST(L3, none) {
-	cpuinfo_caches l3 = cpuinfo_get_l3_cache();
-	ASSERT_EQ(0, l3.count);
-	ASSERT_FALSE(l3.instances);
-}
-
-TEST(L4, none) {
-	cpuinfo_caches l4 = cpuinfo_get_l4_cache();
-	ASSERT_EQ(0, l4.count);
-	ASSERT_FALSE(l4.instances);
-}
-
-int main(int argc, char* argv[]) {
-	cpuinfo_set_proc_cpuinfo_path("test/cpuinfo/pandaboard-es.log");
-	cpuinfo_initialize();
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
diff --git a/test/pixel-c.cc b/test/pixel-c.cc
index d3ccd33..6f0db27 100644
--- a/test/pixel-c.cc
+++ b/test/pixel-c.cc
@@ -315,6 +315,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/pixel-xl.cc b/test/pixel-xl.cc
index d97e1a0..11350e3 100644
--- a/test/pixel-xl.cc
+++ b/test/pixel-xl.cc
@@ -330,6 +330,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/pixel.cc b/test/pixel.cc
index ff3c9e0..ad66e7b 100644
--- a/test/pixel.cc
+++ b/test/pixel.cc
@@ -330,6 +330,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
diff --git a/test/raspberry-pi-zero.cc b/test/raspberry-pi-zero.cc
deleted file mode 100644
index 1f695e3..0000000
--- a/test/raspberry-pi-zero.cc
+++ /dev/null
@@ -1,263 +0,0 @@
-#include <gtest/gtest.h>
-
-#include <cpuinfo.h>
-#include <cpuinfo-mock.h>
-
-
-TEST(PROCESSORS, count) {
-	ASSERT_EQ(1, cpuinfo_processors_count);
-}
-
-TEST(PROCESSORS, non_null) {
-	ASSERT_TRUE(cpuinfo_processors);
-}
-
-TEST(PROCESSORS, vendor) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_vendor_arm, cpuinfo_processors[i].vendor);
-	}
-}
-
-TEST(PROCESSORS, uarch) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_uarch_arm11, cpuinfo_processors[i].uarch);
-	}
-}
-
-TEST(ISA, thumb) {
-	ASSERT_TRUE(cpuinfo_isa.thumb);
-}
-
-TEST(ISA, thumb2) {
-	ASSERT_FALSE(cpuinfo_isa.thumb2);
-}
-
-TEST(ISA, thumbee) {
-	ASSERT_FALSE(cpuinfo_isa.thumbee);
-}
-
-TEST(ISA, jazelle) {
-	ASSERT_TRUE(cpuinfo_isa.jazelle);
-}
-
-TEST(ISA, armv5e) {
-	ASSERT_TRUE(cpuinfo_isa.armv5e);
-}
-
-TEST(ISA, armv6) {
-	ASSERT_TRUE(cpuinfo_isa.armv6);
-}
-
-TEST(ISA, DISABLED_armv6k) {
-	ASSERT_TRUE(cpuinfo_isa.armv6k);
-}
-
-TEST(ISA, armv7) {
-	ASSERT_FALSE(cpuinfo_isa.armv7);
-}
-
-TEST(ISA, armv7mp) {
-	ASSERT_FALSE(cpuinfo_isa.armv7mp);
-}
-
-TEST(ISA, idiv) {
-	ASSERT_FALSE(cpuinfo_isa.idiv);
-}
-
-TEST(ISA, vfpv2) {
-	ASSERT_TRUE(cpuinfo_isa.vfpv2);
-}
-
-TEST(ISA, vfpv3) {
-	ASSERT_FALSE(cpuinfo_isa.vfpv3);
-}
-
-TEST(ISA, d32) {
-	ASSERT_FALSE(cpuinfo_isa.d32);
-}
-
-TEST(ISA, fp16) {
-	ASSERT_FALSE(cpuinfo_isa.fp16);
-}
-
-TEST(ISA, fma) {
-	ASSERT_FALSE(cpuinfo_isa.fma);
-}
-
-TEST(ISA, wmmx) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx);
-}
-
-TEST(ISA, wmmx2) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx2);
-}
-
-TEST(ISA, neon) {
-	ASSERT_FALSE(cpuinfo_isa.neon);
-}
-
-TEST(ISA, aes) {
-	ASSERT_FALSE(cpuinfo_isa.aes);
-}
-
-TEST(ISA, sha1) {
-	ASSERT_FALSE(cpuinfo_isa.sha1);
-}
-
-TEST(ISA, sha2) {
-	ASSERT_FALSE(cpuinfo_isa.sha2);
-}
-
-TEST(ISA, pmull) {
-	ASSERT_FALSE(cpuinfo_isa.pmull);
-}
-
-TEST(ISA, crc32) {
-	ASSERT_FALSE(cpuinfo_isa.crc32);
-}
-
-TEST(L1I, count) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_EQ(1, l1i.count);
-}
-
-TEST(L1I, non_null) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_TRUE(l1i.instances);
-}
-
-TEST(L1I, size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(16 * 1024, l1i.instances[k].size);
-	}
-}
-
-TEST(L1I, associativity) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(4, l1i.instances[k].associativity);
-	}
-}
-
-TEST(L1I, sets) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(128, l1i.instances[k].sets);
-	}
-}
-
-TEST(L1I, partitions) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(1, l1i.instances[k].partitions);
-	}
-}
-
-TEST(L1I, line_size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(32, l1i.instances[k].line_size);
-	}
-}
-
-TEST(L1I, flags) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(0, l1i.instances[k].flags);
-	}
-}
-
-TEST(L1I, processors) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(k, l1i.instances[k].processor_start);
-		ASSERT_EQ(1, l1i.instances[k].processor_count);
-	}
-}
-
-TEST(L1D, count) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_EQ(1, l1d.count);
-}
-
-TEST(L1D, non_null) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_TRUE(l1d.instances);
-}
-
-TEST(L1D, size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(16 * 1024, l1d.instances[k].size);
-	}
-}
-
-TEST(L1D, associativity) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(4, l1d.instances[k].associativity);
-	}
-}
-
-TEST(L1D, sets) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(128, l1d.instances[k].sets);
-	}
-}
-
-TEST(L1D, partitions) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(1, l1d.instances[k].partitions);
-	}
-}
-
-TEST(L1D, line_size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(32, l1d.instances[k].line_size);
-	}
-}
-
-TEST(L1D, flags) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(0, l1d.instances[k].flags);
-	}
-}
-
-TEST(L1D, processors) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(k, l1d.instances[k].processor_start);
-		ASSERT_EQ(1, l1d.instances[k].processor_count);
-	}
-}
-
-TEST(L2, none) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_EQ(0, l2.count);
-	ASSERT_FALSE(l2.instances);
-}
-
-TEST(L3, none) {
-	cpuinfo_caches l3 = cpuinfo_get_l3_cache();
-	ASSERT_EQ(0, l3.count);
-	ASSERT_FALSE(l3.instances);
-}
-
-TEST(L4, none) {
-	cpuinfo_caches l4 = cpuinfo_get_l4_cache();
-	ASSERT_EQ(0, l4.count);
-	ASSERT_FALSE(l4.instances);
-}
-
-int main(int argc, char* argv[]) {
-	cpuinfo_set_fpsid(0x410120B5);
-	cpuinfo_set_proc_cpuinfo_path("test/cpuinfo/raspberrypi-zero.log");
-	cpuinfo_initialize();
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
diff --git a/test/raspberry-pi.cc b/test/raspberry-pi.cc
deleted file mode 100644
index c41ffb4..0000000
--- a/test/raspberry-pi.cc
+++ /dev/null
@@ -1,263 +0,0 @@
-#include <gtest/gtest.h>
-
-#include <cpuinfo.h>
-#include <cpuinfo-mock.h>
-
-
-TEST(PROCESSORS, count) {
-	ASSERT_EQ(1, cpuinfo_processors_count);
-}
-
-TEST(PROCESSORS, non_null) {
-	ASSERT_TRUE(cpuinfo_processors);
-}
-
-TEST(PROCESSORS, vendor) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_vendor_arm, cpuinfo_processors[i].vendor);
-	}
-}
-
-TEST(PROCESSORS, uarch) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_uarch_arm11, cpuinfo_processors[i].uarch);
-	}
-}
-
-TEST(ISA, thumb) {
-	ASSERT_TRUE(cpuinfo_isa.thumb);
-}
-
-TEST(ISA, thumb2) {
-	ASSERT_FALSE(cpuinfo_isa.thumb2);
-}
-
-TEST(ISA, thumbee) {
-	ASSERT_FALSE(cpuinfo_isa.thumbee);
-}
-
-TEST(ISA, jazelle) {
-	ASSERT_TRUE(cpuinfo_isa.jazelle);
-}
-
-TEST(ISA, armv5e) {
-	ASSERT_TRUE(cpuinfo_isa.armv5e);
-}
-
-TEST(ISA, armv6) {
-	ASSERT_TRUE(cpuinfo_isa.armv6);
-}
-
-TEST(ISA, DISABLED_armv6k) {
-	ASSERT_TRUE(cpuinfo_isa.armv6k);
-}
-
-TEST(ISA, armv7) {
-	ASSERT_FALSE(cpuinfo_isa.armv7);
-}
-
-TEST(ISA, armv7mp) {
-	ASSERT_FALSE(cpuinfo_isa.armv7mp);
-}
-
-TEST(ISA, idiv) {
-	ASSERT_FALSE(cpuinfo_isa.idiv);
-}
-
-TEST(ISA, vfpv2) {
-	ASSERT_TRUE(cpuinfo_isa.vfpv2);
-}
-
-TEST(ISA, vfpv3) {
-	ASSERT_FALSE(cpuinfo_isa.vfpv3);
-}
-
-TEST(ISA, d32) {
-	ASSERT_FALSE(cpuinfo_isa.d32);
-}
-
-TEST(ISA, fp16) {
-	ASSERT_FALSE(cpuinfo_isa.fp16);
-}
-
-TEST(ISA, fma) {
-	ASSERT_FALSE(cpuinfo_isa.fma);
-}
-
-TEST(ISA, wmmx) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx);
-}
-
-TEST(ISA, wmmx2) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx2);
-}
-
-TEST(ISA, neon) {
-	ASSERT_FALSE(cpuinfo_isa.neon);
-}
-
-TEST(ISA, aes) {
-	ASSERT_FALSE(cpuinfo_isa.aes);
-}
-
-TEST(ISA, sha1) {
-	ASSERT_FALSE(cpuinfo_isa.sha1);
-}
-
-TEST(ISA, sha2) {
-	ASSERT_FALSE(cpuinfo_isa.sha2);
-}
-
-TEST(ISA, pmull) {
-	ASSERT_FALSE(cpuinfo_isa.pmull);
-}
-
-TEST(ISA, crc32) {
-	ASSERT_FALSE(cpuinfo_isa.crc32);
-}
-
-TEST(L1I, count) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_EQ(1, l1i.count);
-}
-
-TEST(L1I, non_null) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_TRUE(l1i.instances);
-}
-
-TEST(L1I, size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(16 * 1024, l1i.instances[k].size);
-	}
-}
-
-TEST(L1I, associativity) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(4, l1i.instances[k].associativity);
-	}
-}
-
-TEST(L1I, sets) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(128, l1i.instances[k].sets);
-	}
-}
-
-TEST(L1I, partitions) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(1, l1i.instances[k].partitions);
-	}
-}
-
-TEST(L1I, line_size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(32, l1i.instances[k].line_size);
-	}
-}
-
-TEST(L1I, flags) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(0, l1i.instances[k].flags);
-	}
-}
-
-TEST(L1I, processors) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(k, l1i.instances[k].processor_start);
-		ASSERT_EQ(1, l1i.instances[k].processor_count);
-	}
-}
-
-TEST(L1D, count) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_EQ(1, l1d.count);
-}
-
-TEST(L1D, non_null) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_TRUE(l1d.instances);
-}
-
-TEST(L1D, size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(16 * 1024, l1d.instances[k].size);
-	}
-}
-
-TEST(L1D, associativity) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(4, l1d.instances[k].associativity);
-	}
-}
-
-TEST(L1D, sets) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(128, l1d.instances[k].sets);
-	}
-}
-
-TEST(L1D, partitions) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(1, l1d.instances[k].partitions);
-	}
-}
-
-TEST(L1D, line_size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(32, l1d.instances[k].line_size);
-	}
-}
-
-TEST(L1D, flags) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(0, l1d.instances[k].flags);
-	}
-}
-
-TEST(L1D, processors) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(k, l1d.instances[k].processor_start);
-		ASSERT_EQ(1, l1d.instances[k].processor_count);
-	}
-}
-
-TEST(L2, none) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_EQ(0, l2.count);
-	ASSERT_FALSE(l2.instances);
-}
-
-TEST(L3, none) {
-	cpuinfo_caches l3 = cpuinfo_get_l3_cache();
-	ASSERT_EQ(0, l3.count);
-	ASSERT_FALSE(l3.instances);
-}
-
-TEST(L4, none) {
-	cpuinfo_caches l4 = cpuinfo_get_l4_cache();
-	ASSERT_EQ(0, l4.count);
-	ASSERT_FALSE(l4.instances);
-}
-
-int main(int argc, char* argv[]) {
-	cpuinfo_set_fpsid(0x410120B5);
-	cpuinfo_set_proc_cpuinfo_path("test/cpuinfo/raspberrypi.log");
-	cpuinfo_initialize();
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
diff --git a/test/raspberry-pi2.cc b/test/raspberry-pi2.cc
deleted file mode 100644
index 0a7f19f..0000000
--- a/test/raspberry-pi2.cc
+++ /dev/null
@@ -1,316 +0,0 @@
-#include <gtest/gtest.h>
-
-#include <cpuinfo.h>
-#include <cpuinfo-mock.h>
-
-
-TEST(PROCESSORS, count) {
-	ASSERT_EQ(4, cpuinfo_processors_count);
-}
-
-TEST(PROCESSORS, non_null) {
-	ASSERT_TRUE(cpuinfo_processors);
-}
-
-TEST(PROCESSORS, vendor) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_vendor_arm, cpuinfo_processors[i].vendor);
-	}
-}
-
-TEST(PROCESSORS, uarch) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_uarch_cortex_a7, cpuinfo_processors[i].uarch);
-	}
-}
-
-TEST(ISA, thumb) {
-	ASSERT_TRUE(cpuinfo_isa.thumb);
-}
-
-TEST(ISA, thumb2) {
-	ASSERT_TRUE(cpuinfo_isa.thumb2);
-}
-
-TEST(ISA, thumbee) {
-	ASSERT_FALSE(cpuinfo_isa.thumbee);
-}
-
-TEST(ISA, jazelle) {
-	ASSERT_FALSE(cpuinfo_isa.jazelle);
-}
-
-TEST(ISA, armv5e) {
-	ASSERT_TRUE(cpuinfo_isa.armv5e);
-}
-
-TEST(ISA, armv6) {
-	ASSERT_TRUE(cpuinfo_isa.armv6);
-}
-
-TEST(ISA, armv6k) {
-	ASSERT_TRUE(cpuinfo_isa.armv6k);
-}
-
-TEST(ISA, armv7) {
-	ASSERT_TRUE(cpuinfo_isa.armv7);
-}
-
-TEST(ISA, armv7mp) {
-	ASSERT_TRUE(cpuinfo_isa.armv7mp);
-}
-
-TEST(ISA, idiv) {
-	ASSERT_TRUE(cpuinfo_isa.idiv);
-}
-
-TEST(ISA, vfpv2) {
-	ASSERT_FALSE(cpuinfo_isa.vfpv2);
-}
-
-TEST(ISA, vfpv3) {
-	ASSERT_TRUE(cpuinfo_isa.vfpv3);
-}
-
-TEST(ISA, d32) {
-	ASSERT_TRUE(cpuinfo_isa.d32);
-}
-
-TEST(ISA, fp16) {
-	ASSERT_TRUE(cpuinfo_isa.fp16);
-}
-
-TEST(ISA, fma) {
-	ASSERT_TRUE(cpuinfo_isa.fma);
-}
-
-TEST(ISA, wmmx) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx);
-}
-
-TEST(ISA, wmmx2) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx2);
-}
-
-TEST(ISA, neon) {
-	ASSERT_TRUE(cpuinfo_isa.neon);
-}
-
-TEST(ISA, aes) {
-	ASSERT_FALSE(cpuinfo_isa.aes);
-}
-
-TEST(ISA, sha1) {
-	ASSERT_FALSE(cpuinfo_isa.sha1);
-}
-
-TEST(ISA, sha2) {
-	ASSERT_FALSE(cpuinfo_isa.sha2);
-}
-
-TEST(ISA, pmull) {
-	ASSERT_FALSE(cpuinfo_isa.pmull);
-}
-
-TEST(ISA, crc32) {
-	ASSERT_FALSE(cpuinfo_isa.crc32);
-}
-
-TEST(L1I, count) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_EQ(4, l1i.count);
-}
-
-TEST(L1I, non_null) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_TRUE(l1i.instances);
-}
-
-TEST(L1I, size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(32 * 1024, l1i.instances[k].size);
-	}
-}
-
-TEST(L1I, associativity) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(2, l1i.instances[k].associativity);
-	}
-}
-
-TEST(L1I, sets) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(512, l1i.instances[k].sets);
-	}
-}
-
-TEST(L1I, partitions) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(1, l1i.instances[k].partitions);
-	}
-}
-
-TEST(L1I, line_size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(32, l1i.instances[k].line_size);
-	}
-}
-
-TEST(L1I, flags) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(0, l1i.instances[k].flags);
-	}
-}
-
-TEST(L1I, processors) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(k, l1i.instances[k].processor_start);
-		ASSERT_EQ(1, l1i.instances[k].processor_count);
-	}
-}
-
-TEST(L1D, count) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_EQ(4, l1d.count);
-}
-
-TEST(L1D, non_null) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_TRUE(l1d.instances);
-}
-
-TEST(L1D, size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(32 * 1024, l1d.instances[k].size);
-	}
-}
-
-TEST(L1D, associativity) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(4, l1d.instances[k].associativity);
-	}
-}
-
-TEST(L1D, sets) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(128, l1d.instances[k].sets);
-	}
-}
-
-TEST(L1D, partitions) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(1, l1d.instances[k].partitions);
-	}
-}
-
-TEST(L1D, line_size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(64, l1d.instances[k].line_size);
-	}
-}
-
-TEST(L1D, flags) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(0, l1d.instances[k].flags);
-	}
-}
-
-TEST(L1D, processors) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(k, l1d.instances[k].processor_start);
-		ASSERT_EQ(1, l1d.instances[k].processor_count);
-	}
-}
-
-TEST(L2, count) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_EQ(1, l2.count);
-}
-
-TEST(L2, non_null) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_TRUE(l2.instances);
-}
-
-TEST(L2, size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(512 * 1024, l2.instances[k].size);
-	}
-}
-
-TEST(L2, associativity) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(8, l2.instances[k].associativity);
-	}
-}
-
-TEST(L2, sets) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(1024, l2.instances[k].sets);
-	}
-}
-
-TEST(L2, partitions) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(1, l2.instances[k].partitions);
-	}
-}
-
-TEST(L2, line_size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(64, l2.instances[k].line_size);
-	}
-}
-
-TEST(L2, flags) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(0, l2.instances[k].flags);
-	}
-}
-
-TEST(L2, processors) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(0, l2.instances[k].processor_start);
-		ASSERT_EQ(4, l2.instances[k].processor_count);
-	}
-}
-
-TEST(L3, none) {
-	cpuinfo_caches l3 = cpuinfo_get_l3_cache();
-	ASSERT_EQ(0, l3.count);
-	ASSERT_FALSE(l3.instances);
-}
-
-TEST(L4, none) {
-	cpuinfo_caches l4 = cpuinfo_get_l4_cache();
-	ASSERT_EQ(0, l4.count);
-	ASSERT_FALSE(l4.instances);
-}
-
-int main(int argc, char* argv[]) {
-	cpuinfo_set_proc_cpuinfo_path("test/cpuinfo/raspberrypi2.log");
-	cpuinfo_initialize();
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
diff --git a/test/raspberry-pi3.cc b/test/raspberry-pi3.cc
deleted file mode 100644
index dbba578..0000000
--- a/test/raspberry-pi3.cc
+++ /dev/null
@@ -1,316 +0,0 @@
-#include <gtest/gtest.h>
-
-#include <cpuinfo.h>
-#include <cpuinfo-mock.h>
-
-
-TEST(PROCESSORS, count) {
-	ASSERT_EQ(4, cpuinfo_processors_count);
-}
-
-TEST(PROCESSORS, non_null) {
-	ASSERT_TRUE(cpuinfo_processors);
-}
-
-TEST(PROCESSORS, vendor) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_vendor_arm, cpuinfo_processors[i].vendor);
-	}
-}
-
-TEST(PROCESSORS, uarch) {
-	for (uint32_t i = 0; i < cpuinfo_processors_count; i++) {
-		ASSERT_EQ(cpuinfo_uarch_cortex_a53, cpuinfo_processors[i].uarch);
-	}
-}
-
-TEST(ISA, thumb) {
-	ASSERT_TRUE(cpuinfo_isa.thumb);
-}
-
-TEST(ISA, thumb2) {
-	ASSERT_TRUE(cpuinfo_isa.thumb2);
-}
-
-TEST(ISA, thumbee) {
-	ASSERT_FALSE(cpuinfo_isa.thumbee);
-}
-
-TEST(ISA, jazelle) {
-	ASSERT_FALSE(cpuinfo_isa.jazelle);
-}
-
-TEST(ISA, armv5e) {
-	ASSERT_TRUE(cpuinfo_isa.armv5e);
-}
-
-TEST(ISA, armv6) {
-	ASSERT_TRUE(cpuinfo_isa.armv6);
-}
-
-TEST(ISA, armv6k) {
-	ASSERT_TRUE(cpuinfo_isa.armv6k);
-}
-
-TEST(ISA, armv7) {
-	ASSERT_TRUE(cpuinfo_isa.armv7);
-}
-
-TEST(ISA, armv7mp) {
-	ASSERT_TRUE(cpuinfo_isa.armv7mp);
-}
-
-TEST(ISA, idiv) {
-	ASSERT_TRUE(cpuinfo_isa.idiv);
-}
-
-TEST(ISA, vfpv2) {
-	ASSERT_FALSE(cpuinfo_isa.vfpv2);
-}
-
-TEST(ISA, vfpv3) {
-	ASSERT_TRUE(cpuinfo_isa.vfpv3);
-}
-
-TEST(ISA, d32) {
-	ASSERT_TRUE(cpuinfo_isa.d32);
-}
-
-TEST(ISA, fp16) {
-	ASSERT_TRUE(cpuinfo_isa.fp16);
-}
-
-TEST(ISA, fma) {
-	ASSERT_TRUE(cpuinfo_isa.fma);
-}
-
-TEST(ISA, wmmx) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx);
-}
-
-TEST(ISA, wmmx2) {
-	ASSERT_FALSE(cpuinfo_isa.wmmx2);
-}
-
-TEST(ISA, neon) {
-	ASSERT_TRUE(cpuinfo_isa.neon);
-}
-
-TEST(ISA, aes) {
-	ASSERT_FALSE(cpuinfo_isa.aes);
-}
-
-TEST(ISA, sha1) {
-	ASSERT_FALSE(cpuinfo_isa.sha1);
-}
-
-TEST(ISA, sha2) {
-	ASSERT_FALSE(cpuinfo_isa.sha2);
-}
-
-TEST(ISA, pmull) {
-	ASSERT_FALSE(cpuinfo_isa.pmull);
-}
-
-TEST(ISA, crc32) {
-	ASSERT_TRUE(cpuinfo_isa.crc32);
-}
-
-TEST(L1I, count) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_EQ(4, l1i.count);
-}
-
-TEST(L1I, non_null) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	ASSERT_TRUE(l1i.instances);
-}
-
-TEST(L1I, size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(16 * 1024, l1i.instances[k].size);
-	}
-}
-
-TEST(L1I, associativity) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(2, l1i.instances[k].associativity);
-	}
-}
-
-TEST(L1I, sets) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(128, l1i.instances[k].sets);
-	}
-}
-
-TEST(L1I, partitions) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(1, l1i.instances[k].partitions);
-	}
-}
-
-TEST(L1I, line_size) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(64, l1i.instances[k].line_size);
-	}
-}
-
-TEST(L1I, flags) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(0, l1i.instances[k].flags);
-	}
-}
-
-TEST(L1I, processors) {
-	cpuinfo_caches l1i = cpuinfo_get_l1i_cache();
-	for (uint32_t k = 0; k < l1i.count; k++) {
-		ASSERT_EQ(k, l1i.instances[k].processor_start);
-		ASSERT_EQ(1, l1i.instances[k].processor_count);
-	}
-}
-
-TEST(L1D, count) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_EQ(4, l1d.count);
-}
-
-TEST(L1D, non_null) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	ASSERT_TRUE(l1d.instances);
-}
-
-TEST(L1D, size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(16 * 1024, l1d.instances[k].size);
-	}
-}
-
-TEST(L1D, associativity) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(4, l1d.instances[k].associativity);
-	}
-}
-
-TEST(L1D, sets) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(64, l1d.instances[k].sets);
-	}
-}
-
-TEST(L1D, partitions) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(1, l1d.instances[k].partitions);
-	}
-}
-
-TEST(L1D, line_size) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(64, l1d.instances[k].line_size);
-	}
-}
-
-TEST(L1D, flags) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(0, l1d.instances[k].flags);
-	}
-}
-
-TEST(L1D, processors) {
-	cpuinfo_caches l1d = cpuinfo_get_l1d_cache();
-	for (uint32_t k = 0; k < l1d.count; k++) {
-		ASSERT_EQ(k, l1d.instances[k].processor_start);
-		ASSERT_EQ(1, l1d.instances[k].processor_count);
-	}
-}
-
-TEST(L2, count) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_EQ(1, l2.count);
-}
-
-TEST(L2, non_null) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	ASSERT_TRUE(l2.instances);
-}
-
-TEST(L2, size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(512 * 1024, l2.instances[k].size);
-	}
-}
-
-TEST(L2, associativity) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(16, l2.instances[k].associativity);
-	}
-}
-
-TEST(L2, sets) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(512, l2.instances[k].sets);
-	}
-}
-
-TEST(L2, partitions) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(1, l2.instances[k].partitions);
-	}
-}
-
-TEST(L2, line_size) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(64, l2.instances[k].line_size);
-	}
-}
-
-TEST(L2, flags) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(0, l2.instances[k].flags);
-	}
-}
-
-TEST(L2, processors) {
-	cpuinfo_caches l2 = cpuinfo_get_l2_cache();
-	for (uint32_t k = 0; k < l2.count; k++) {
-		ASSERT_EQ(0, l2.instances[k].processor_start);
-		ASSERT_EQ(4, l2.instances[k].processor_count);
-	}
-}
-
-TEST(L3, none) {
-	cpuinfo_caches l3 = cpuinfo_get_l3_cache();
-	ASSERT_EQ(0, l3.count);
-	ASSERT_FALSE(l3.instances);
-}
-
-TEST(L4, none) {
-	cpuinfo_caches l4 = cpuinfo_get_l4_cache();
-	ASSERT_EQ(0, l4.count);
-	ASSERT_FALSE(l4.instances);
-}
-
-int main(int argc, char* argv[]) {
-	cpuinfo_set_proc_cpuinfo_path("test/cpuinfo/raspberrypi3.log");
-	cpuinfo_initialize();
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
diff --git a/test/xperia-c4-dual.cc b/test/xperia-c4-dual.cc
index 758a107..ef982fe 100644
--- a/test/xperia-c4-dual.cc
+++ b/test/xperia-c4-dual.cc
@@ -323,6 +323,9 @@ TEST(L4, none) {
 
 int main(int argc, char* argv[]) {
 	cpuinfo_mock_filesystem(filesystem);
+#ifdef __ANDROID__
+	cpuinfo_mock_android_properties(properties);
+#endif
 	cpuinfo_initialize();
 	::testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();