1087 files changed, 2348 insertions, 1082 deletions

diff --git a/tests/OWNERS b/tests/OWNERS
new file mode 100644
index 00000000..4aa5fe52
--- /dev/null
+++ b/tests/OWNERS
@@ -0,0 +1,2 @@
+nchalko@google.com
+shubang@google.com
diff --git a/tests/common/Android.mk b/tests/common/Android.mk
index aecd15bc..27c9f031 100644
--- a/tests/common/Android.mk
+++ b/tests/common/Android.mk
@@ -17,7 +17,7 @@ LOCAL_JAVA_LIBRARIES := tv-common
 LOCAL_INSTRUMENTATION_FOR := LiveTv
 LOCAL_MODULE := tv-test-common
 LOCAL_MODULE_TAGS := optional
-LOCAL_SDK_VERSION := system_current
+LOCAL_SDK_VERSION := current
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 LOCAL_AIDL_INCLUDES += $(LOCAL_PATH)/src
diff --git a/tests/common/OWNERS b/tests/common/OWNERS
new file mode 100644
index 00000000..4aa5fe52
--- /dev/null
+++ b/tests/common/OWNERS
@@ -0,0 +1,2 @@
+nchalko@google.com
+shubang@google.com
diff --git a/tests/input/res/drawable-xhdpi/ch_1000_logo.png b/tests/common/res/drawable-xhdpi/ch_1000_logo.png
index eec6d373..eec6d373 100644
--- a/tests/input/res/drawable-xhdpi/ch_1000_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_1000_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_100_logo.png b/tests/common/res/drawable-xhdpi/ch_100_logo.png
index 3a8b6731..3a8b6731 100644
--- a/tests/input/res/drawable-xhdpi/ch_100_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_100_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_101_logo.png b/tests/common/res/drawable-xhdpi/ch_101_logo.png
index 2977ef1d..2977ef1d 100644
--- a/tests/input/res/drawable-xhdpi/ch_101_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_101_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_102_logo.png b/tests/common/res/drawable-xhdpi/ch_102_logo.png
index 978112e1..978112e1 100644
--- a/tests/input/res/drawable-xhdpi/ch_102_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_102_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_103_logo.png b/tests/common/res/drawable-xhdpi/ch_103_logo.png
index ceb1fd6a..ceb1fd6a 100644
--- a/tests/input/res/drawable-xhdpi/ch_103_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_103_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_104_logo.png b/tests/common/res/drawable-xhdpi/ch_104_logo.png
index c927568d..c927568d 100644
--- a/tests/input/res/drawable-xhdpi/ch_104_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_104_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_105_logo.png b/tests/common/res/drawable-xhdpi/ch_105_logo.png
index 8e1be19d..8e1be19d 100644
--- a/tests/input/res/drawable-xhdpi/ch_105_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_105_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_106_logo.png b/tests/common/res/drawable-xhdpi/ch_106_logo.png
index a19c9ef8..a19c9ef8 100644
--- a/tests/input/res/drawable-xhdpi/ch_106_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_106_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_107_logo.png b/tests/common/res/drawable-xhdpi/ch_107_logo.png
index 9d36a488..9d36a488 100644
--- a/tests/input/res/drawable-xhdpi/ch_107_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_107_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_108_logo.png b/tests/common/res/drawable-xhdpi/ch_108_logo.png
index 700ae189..700ae189 100644
--- a/tests/input/res/drawable-xhdpi/ch_108_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_108_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_109_logo.png b/tests/common/res/drawable-xhdpi/ch_109_logo.png
index 209e3b47..209e3b47 100644
--- a/tests/input/res/drawable-xhdpi/ch_109_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_109_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_10_logo.png b/tests/common/res/drawable-xhdpi/ch_10_logo.png
index 76b3a9b2..76b3a9b2 100644
--- a/tests/input/res/drawable-xhdpi/ch_10_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_10_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_110_logo.png b/tests/common/res/drawable-xhdpi/ch_110_logo.png
index 0c0c1920..0c0c1920 100644
--- a/tests/input/res/drawable-xhdpi/ch_110_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_110_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_111_logo.png b/tests/common/res/drawable-xhdpi/ch_111_logo.png
index 07c7ee83..07c7ee83 100644
--- a/tests/input/res/drawable-xhdpi/ch_111_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_111_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_112_logo.png b/tests/common/res/drawable-xhdpi/ch_112_logo.png
index 1675e54d..1675e54d 100644
--- a/tests/input/res/drawable-xhdpi/ch_112_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_112_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_113_logo.png b/tests/common/res/drawable-xhdpi/ch_113_logo.png
index 57cc81ce..57cc81ce 100644
--- a/tests/input/res/drawable-xhdpi/ch_113_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_113_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_114_logo.png b/tests/common/res/drawable-xhdpi/ch_114_logo.png
index 3d57f201..3d57f201 100644
--- a/tests/input/res/drawable-xhdpi/ch_114_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_114_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_115_logo.png b/tests/common/res/drawable-xhdpi/ch_115_logo.png
index 3897f5c9..3897f5c9 100644
--- a/tests/input/res/drawable-xhdpi/ch_115_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_115_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_116_logo.png b/tests/common/res/drawable-xhdpi/ch_116_logo.png
index 83a55a67..83a55a67 100644
--- a/tests/input/res/drawable-xhdpi/ch_116_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_116_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_117_logo.png b/tests/common/res/drawable-xhdpi/ch_117_logo.png
index 4b4eccf0..4b4eccf0 100644
--- a/tests/input/res/drawable-xhdpi/ch_117_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_117_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_118_logo.png b/tests/common/res/drawable-xhdpi/ch_118_logo.png
index 4a682f67..4a682f67 100644
--- a/tests/input/res/drawable-xhdpi/ch_118_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_118_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_119_logo.png b/tests/common/res/drawable-xhdpi/ch_119_logo.png
index 2a2aed5e..2a2aed5e 100644
--- a/tests/input/res/drawable-xhdpi/ch_119_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_119_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_11_logo.png b/tests/common/res/drawable-xhdpi/ch_11_logo.png
index 62268929..62268929 100644
--- a/tests/input/res/drawable-xhdpi/ch_11_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_11_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_120_logo.png b/tests/common/res/drawable-xhdpi/ch_120_logo.png
index 46c5f97a..46c5f97a 100644
--- a/tests/input/res/drawable-xhdpi/ch_120_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_120_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_121_logo.png b/tests/common/res/drawable-xhdpi/ch_121_logo.png
index 650bd3e4..650bd3e4 100644
--- a/tests/input/res/drawable-xhdpi/ch_121_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_121_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_122_logo.png b/tests/common/res/drawable-xhdpi/ch_122_logo.png
index 5a3c5d7b..5a3c5d7b 100644
--- a/tests/input/res/drawable-xhdpi/ch_122_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_122_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_123_logo.png b/tests/common/res/drawable-xhdpi/ch_123_logo.png
index ade9ab29..ade9ab29 100644
--- a/tests/input/res/drawable-xhdpi/ch_123_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_123_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_124_logo.png b/tests/common/res/drawable-xhdpi/ch_124_logo.png
index 62d15c06..62d15c06 100644
--- a/tests/input/res/drawable-xhdpi/ch_124_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_124_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_125_logo.png b/tests/common/res/drawable-xhdpi/ch_125_logo.png
index 34af08a9..34af08a9 100644
--- a/tests/input/res/drawable-xhdpi/ch_125_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_125_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_126_logo.png b/tests/common/res/drawable-xhdpi/ch_126_logo.png
index 8d10d163..8d10d163 100644
--- a/tests/input/res/drawable-xhdpi/ch_126_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_126_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_127_logo.png b/tests/common/res/drawable-xhdpi/ch_127_logo.png
index 428f8e0d..428f8e0d 100644
--- a/tests/input/res/drawable-xhdpi/ch_127_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_127_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_128_logo.png b/tests/common/res/drawable-xhdpi/ch_128_logo.png
index 536e04fa..536e04fa 100644
--- a/tests/input/res/drawable-xhdpi/ch_128_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_128_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_129_logo.png b/tests/common/res/drawable-xhdpi/ch_129_logo.png
index 79fc8dc8..79fc8dc8 100644
--- a/tests/input/res/drawable-xhdpi/ch_129_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_129_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_12_logo.png b/tests/common/res/drawable-xhdpi/ch_12_logo.png
index 5f155f41..5f155f41 100644
--- a/tests/input/res/drawable-xhdpi/ch_12_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_12_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_130_logo.png b/tests/common/res/drawable-xhdpi/ch_130_logo.png
index b2bc041f..b2bc041f 100644
--- a/tests/input/res/drawable-xhdpi/ch_130_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_130_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_131_logo.png b/tests/common/res/drawable-xhdpi/ch_131_logo.png
index 06081906..06081906 100644
--- a/tests/input/res/drawable-xhdpi/ch_131_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_131_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_132_logo.png b/tests/common/res/drawable-xhdpi/ch_132_logo.png
index 18a0bdef..18a0bdef 100644
--- a/tests/input/res/drawable-xhdpi/ch_132_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_132_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_133_logo.png b/tests/common/res/drawable-xhdpi/ch_133_logo.png
index 312027b2..312027b2 100644
--- a/tests/input/res/drawable-xhdpi/ch_133_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_133_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_134_logo.png b/tests/common/res/drawable-xhdpi/ch_134_logo.png
index c551922e..c551922e 100644
--- a/tests/input/res/drawable-xhdpi/ch_134_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_134_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_135_logo.png b/tests/common/res/drawable-xhdpi/ch_135_logo.png
index 64d7b889..64d7b889 100644
--- a/tests/input/res/drawable-xhdpi/ch_135_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_135_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_136_logo.png b/tests/common/res/drawable-xhdpi/ch_136_logo.png
index 31021239..31021239 100644
--- a/tests/input/res/drawable-xhdpi/ch_136_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_136_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_137_logo.png b/tests/common/res/drawable-xhdpi/ch_137_logo.png
index a7f8cfb8..a7f8cfb8 100644
--- a/tests/input/res/drawable-xhdpi/ch_137_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_137_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_138_logo.png b/tests/common/res/drawable-xhdpi/ch_138_logo.png
index 981425f0..981425f0 100644
--- a/tests/input/res/drawable-xhdpi/ch_138_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_138_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_139_logo.png b/tests/common/res/drawable-xhdpi/ch_139_logo.png
index 03170e5e..03170e5e 100644
--- a/tests/input/res/drawable-xhdpi/ch_139_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_139_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_13_logo.png b/tests/common/res/drawable-xhdpi/ch_13_logo.png
index 817922f8..817922f8 100644
--- a/tests/input/res/drawable-xhdpi/ch_13_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_13_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_140_logo.png b/tests/common/res/drawable-xhdpi/ch_140_logo.png
index f26cf917..f26cf917 100644
--- a/tests/input/res/drawable-xhdpi/ch_140_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_140_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_141_logo.png b/tests/common/res/drawable-xhdpi/ch_141_logo.png
index 0064d436..0064d436 100644
--- a/tests/input/res/drawable-xhdpi/ch_141_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_141_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_142_logo.png b/tests/common/res/drawable-xhdpi/ch_142_logo.png
index 1d28785e..1d28785e 100644
--- a/tests/input/res/drawable-xhdpi/ch_142_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_142_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_143_logo.png b/tests/common/res/drawable-xhdpi/ch_143_logo.png
index 6f6bb7ea..6f6bb7ea 100644
--- a/tests/input/res/drawable-xhdpi/ch_143_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_143_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_144_logo.png b/tests/common/res/drawable-xhdpi/ch_144_logo.png
index afa678cc..afa678cc 100644
--- a/tests/input/res/drawable-xhdpi/ch_144_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_144_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_145_logo.png b/tests/common/res/drawable-xhdpi/ch_145_logo.png
index 0e989ba5..0e989ba5 100644
--- a/tests/input/res/drawable-xhdpi/ch_145_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_145_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_146_logo.png b/tests/common/res/drawable-xhdpi/ch_146_logo.png
index 4ee0082c..4ee0082c 100644
--- a/tests/input/res/drawable-xhdpi/ch_146_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_146_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_147_logo.png b/tests/common/res/drawable-xhdpi/ch_147_logo.png
index ddcc91dd..ddcc91dd 100644
--- a/tests/input/res/drawable-xhdpi/ch_147_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_147_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_148_logo.png b/tests/common/res/drawable-xhdpi/ch_148_logo.png
index c7f0c42a..c7f0c42a 100644
--- a/tests/input/res/drawable-xhdpi/ch_148_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_148_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_149_logo.png b/tests/common/res/drawable-xhdpi/ch_149_logo.png
index f2d38ace..f2d38ace 100644
--- a/tests/input/res/drawable-xhdpi/ch_149_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_149_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_14_logo.png b/tests/common/res/drawable-xhdpi/ch_14_logo.png
index f66db228..f66db228 100644
--- a/tests/input/res/drawable-xhdpi/ch_14_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_14_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_150_logo.png b/tests/common/res/drawable-xhdpi/ch_150_logo.png
index 6efad527..6efad527 100644
--- a/tests/input/res/drawable-xhdpi/ch_150_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_150_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_151_logo.png b/tests/common/res/drawable-xhdpi/ch_151_logo.png
index b37e11ea..b37e11ea 100644
--- a/tests/input/res/drawable-xhdpi/ch_151_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_151_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_152_logo.png b/tests/common/res/drawable-xhdpi/ch_152_logo.png
index 81f872a5..81f872a5 100644
--- a/tests/input/res/drawable-xhdpi/ch_152_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_152_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_153_logo.png b/tests/common/res/drawable-xhdpi/ch_153_logo.png
index e564739d..e564739d 100644
--- a/tests/input/res/drawable-xhdpi/ch_153_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_153_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_154_logo.png b/tests/common/res/drawable-xhdpi/ch_154_logo.png
index 331498e8..331498e8 100644
--- a/tests/input/res/drawable-xhdpi/ch_154_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_154_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_155_logo.png b/tests/common/res/drawable-xhdpi/ch_155_logo.png
index da8c34d4..da8c34d4 100644
--- a/tests/input/res/drawable-xhdpi/ch_155_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_155_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_156_logo.png b/tests/common/res/drawable-xhdpi/ch_156_logo.png
index 5ca6d550..5ca6d550 100644
--- a/tests/input/res/drawable-xhdpi/ch_156_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_156_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_157_logo.png b/tests/common/res/drawable-xhdpi/ch_157_logo.png
index 460ece79..460ece79 100644
--- a/tests/input/res/drawable-xhdpi/ch_157_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_157_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_158_logo.png b/tests/common/res/drawable-xhdpi/ch_158_logo.png
index 8d11e42e..8d11e42e 100644
--- a/tests/input/res/drawable-xhdpi/ch_158_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_158_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_159_logo.png b/tests/common/res/drawable-xhdpi/ch_159_logo.png
index a10cf881..a10cf881 100644
--- a/tests/input/res/drawable-xhdpi/ch_159_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_159_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_15_logo.png b/tests/common/res/drawable-xhdpi/ch_15_logo.png
index ae4fc936..ae4fc936 100644
--- a/tests/input/res/drawable-xhdpi/ch_15_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_15_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_160_logo.png b/tests/common/res/drawable-xhdpi/ch_160_logo.png
index c219ea72..c219ea72 100644
--- a/tests/input/res/drawable-xhdpi/ch_160_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_160_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_161_logo.png b/tests/common/res/drawable-xhdpi/ch_161_logo.png
index 2b13ad83..2b13ad83 100644
--- a/tests/input/res/drawable-xhdpi/ch_161_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_161_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_162_logo.png b/tests/common/res/drawable-xhdpi/ch_162_logo.png
index 11bfadca..11bfadca 100644
--- a/tests/input/res/drawable-xhdpi/ch_162_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_162_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_163_logo.png b/tests/common/res/drawable-xhdpi/ch_163_logo.png
index 9c41b03a..9c41b03a 100644
--- a/tests/input/res/drawable-xhdpi/ch_163_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_163_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_164_logo.png b/tests/common/res/drawable-xhdpi/ch_164_logo.png
index ec4a101e..ec4a101e 100644
--- a/tests/input/res/drawable-xhdpi/ch_164_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_164_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_165_logo.png b/tests/common/res/drawable-xhdpi/ch_165_logo.png
index 1aceac38..1aceac38 100644
--- a/tests/input/res/drawable-xhdpi/ch_165_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_165_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_166_logo.png b/tests/common/res/drawable-xhdpi/ch_166_logo.png
index f731014f..f731014f 100644
--- a/tests/input/res/drawable-xhdpi/ch_166_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_166_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_167_logo.png b/tests/common/res/drawable-xhdpi/ch_167_logo.png
index 08c82fbf..08c82fbf 100644
--- a/tests/input/res/drawable-xhdpi/ch_167_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_167_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_168_logo.png b/tests/common/res/drawable-xhdpi/ch_168_logo.png
index 0c5707bc..0c5707bc 100644
--- a/tests/input/res/drawable-xhdpi/ch_168_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_168_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_169_logo.png b/tests/common/res/drawable-xhdpi/ch_169_logo.png
index a9710cec..a9710cec 100644
--- a/tests/input/res/drawable-xhdpi/ch_169_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_169_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_16_logo.png b/tests/common/res/drawable-xhdpi/ch_16_logo.png
index 76aee2de..76aee2de 100644
--- a/tests/input/res/drawable-xhdpi/ch_16_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_16_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_170_logo.png b/tests/common/res/drawable-xhdpi/ch_170_logo.png
index 1bf43fa7..1bf43fa7 100644
--- a/tests/input/res/drawable-xhdpi/ch_170_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_170_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_171_logo.png b/tests/common/res/drawable-xhdpi/ch_171_logo.png
index 8c6d6fde..8c6d6fde 100644
--- a/tests/input/res/drawable-xhdpi/ch_171_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_171_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_172_logo.png b/tests/common/res/drawable-xhdpi/ch_172_logo.png
index 13d73ec7..13d73ec7 100644
--- a/tests/input/res/drawable-xhdpi/ch_172_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_172_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_173_logo.png b/tests/common/res/drawable-xhdpi/ch_173_logo.png
index 2423b0ab..2423b0ab 100644
--- a/tests/input/res/drawable-xhdpi/ch_173_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_173_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_174_logo.png b/tests/common/res/drawable-xhdpi/ch_174_logo.png
index 2f752dce..2f752dce 100644
--- a/tests/input/res/drawable-xhdpi/ch_174_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_174_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_175_logo.png b/tests/common/res/drawable-xhdpi/ch_175_logo.png
index ffe3b45e..ffe3b45e 100644
--- a/tests/input/res/drawable-xhdpi/ch_175_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_175_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_176_logo.png b/tests/common/res/drawable-xhdpi/ch_176_logo.png
index d35592de..d35592de 100644
--- a/tests/input/res/drawable-xhdpi/ch_176_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_176_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_177_logo.png b/tests/common/res/drawable-xhdpi/ch_177_logo.png
index c50df44f..c50df44f 100644
--- a/tests/input/res/drawable-xhdpi/ch_177_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_177_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_178_logo.png b/tests/common/res/drawable-xhdpi/ch_178_logo.png
index 22539784..22539784 100644
--- a/tests/input/res/drawable-xhdpi/ch_178_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_178_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_179_logo.png b/tests/common/res/drawable-xhdpi/ch_179_logo.png
index a2c1946b..a2c1946b 100644
--- a/tests/input/res/drawable-xhdpi/ch_179_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_179_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_17_logo.png b/tests/common/res/drawable-xhdpi/ch_17_logo.png
index 0189498f..0189498f 100644
--- a/tests/input/res/drawable-xhdpi/ch_17_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_17_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_180_logo.png b/tests/common/res/drawable-xhdpi/ch_180_logo.png
index 9c72f2ab..9c72f2ab 100644
--- a/tests/input/res/drawable-xhdpi/ch_180_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_180_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_181_logo.png b/tests/common/res/drawable-xhdpi/ch_181_logo.png
index 23610936..23610936 100644
--- a/tests/input/res/drawable-xhdpi/ch_181_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_181_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_182_logo.png b/tests/common/res/drawable-xhdpi/ch_182_logo.png
index c36bc811..c36bc811 100644
--- a/tests/input/res/drawable-xhdpi/ch_182_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_182_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_183_logo.png b/tests/common/res/drawable-xhdpi/ch_183_logo.png
index e0e75a41..e0e75a41 100644
--- a/tests/input/res/drawable-xhdpi/ch_183_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_183_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_184_logo.png b/tests/common/res/drawable-xhdpi/ch_184_logo.png
index 334598f7..334598f7 100644
--- a/tests/input/res/drawable-xhdpi/ch_184_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_184_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_185_logo.png b/tests/common/res/drawable-xhdpi/ch_185_logo.png
index 6891720d..6891720d 100644
--- a/tests/input/res/drawable-xhdpi/ch_185_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_185_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_186_logo.png b/tests/common/res/drawable-xhdpi/ch_186_logo.png
index 58fc146a..58fc146a 100644
--- a/tests/input/res/drawable-xhdpi/ch_186_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_186_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_187_logo.png b/tests/common/res/drawable-xhdpi/ch_187_logo.png
index 6d4f46fc..6d4f46fc 100644
--- a/tests/input/res/drawable-xhdpi/ch_187_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_187_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_188_logo.png b/tests/common/res/drawable-xhdpi/ch_188_logo.png
index 96fc401c..96fc401c 100644
--- a/tests/input/res/drawable-xhdpi/ch_188_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_188_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_189_logo.png b/tests/common/res/drawable-xhdpi/ch_189_logo.png
index 93dd4050..93dd4050 100644
--- a/tests/input/res/drawable-xhdpi/ch_189_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_189_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_18_logo.png b/tests/common/res/drawable-xhdpi/ch_18_logo.png
index 2025821b..2025821b 100644
--- a/tests/input/res/drawable-xhdpi/ch_18_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_18_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_190_logo.png b/tests/common/res/drawable-xhdpi/ch_190_logo.png
index ea257681..ea257681 100644
--- a/tests/input/res/drawable-xhdpi/ch_190_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_190_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_191_logo.png b/tests/common/res/drawable-xhdpi/ch_191_logo.png
index 2ac4c189..2ac4c189 100644
--- a/tests/input/res/drawable-xhdpi/ch_191_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_191_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_192_logo.png b/tests/common/res/drawable-xhdpi/ch_192_logo.png
index 14728cd3..14728cd3 100644
--- a/tests/input/res/drawable-xhdpi/ch_192_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_192_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_193_logo.png b/tests/common/res/drawable-xhdpi/ch_193_logo.png
index dbbf2a1f..dbbf2a1f 100644
--- a/tests/input/res/drawable-xhdpi/ch_193_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_193_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_194_logo.png b/tests/common/res/drawable-xhdpi/ch_194_logo.png
index aabcefda..aabcefda 100644
--- a/tests/input/res/drawable-xhdpi/ch_194_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_194_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_195_logo.png b/tests/common/res/drawable-xhdpi/ch_195_logo.png
index e0158d09..e0158d09 100644
--- a/tests/input/res/drawable-xhdpi/ch_195_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_195_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_196_logo.png b/tests/common/res/drawable-xhdpi/ch_196_logo.png
index a1087785..a1087785 100644
--- a/tests/input/res/drawable-xhdpi/ch_196_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_196_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_197_logo.png b/tests/common/res/drawable-xhdpi/ch_197_logo.png
index 5644e83c..5644e83c 100644
--- a/tests/input/res/drawable-xhdpi/ch_197_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_197_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_198_logo.png b/tests/common/res/drawable-xhdpi/ch_198_logo.png
index c06acf55..c06acf55 100644
--- a/tests/input/res/drawable-xhdpi/ch_198_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_198_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_199_logo.png b/tests/common/res/drawable-xhdpi/ch_199_logo.png
index 6d5ec3ab..6d5ec3ab 100644
--- a/tests/input/res/drawable-xhdpi/ch_199_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_199_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_19_logo.png b/tests/common/res/drawable-xhdpi/ch_19_logo.png
index 5e729625..5e729625 100644
--- a/tests/input/res/drawable-xhdpi/ch_19_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_19_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_1_logo.png b/tests/common/res/drawable-xhdpi/ch_1_logo.png
index 0a39d154..0a39d154 100644
--- a/tests/input/res/drawable-xhdpi/ch_1_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_1_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_200_logo.png b/tests/common/res/drawable-xhdpi/ch_200_logo.png
index 7999b2f6..7999b2f6 100644
--- a/tests/input/res/drawable-xhdpi/ch_200_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_200_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_201_logo.png b/tests/common/res/drawable-xhdpi/ch_201_logo.png
index 68c868e9..68c868e9 100644
--- a/tests/input/res/drawable-xhdpi/ch_201_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_201_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_202_logo.png b/tests/common/res/drawable-xhdpi/ch_202_logo.png
index abd838fa..abd838fa 100644
--- a/tests/input/res/drawable-xhdpi/ch_202_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_202_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_203_logo.png b/tests/common/res/drawable-xhdpi/ch_203_logo.png
index f91c34cc..f91c34cc 100644
--- a/tests/input/res/drawable-xhdpi/ch_203_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_203_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_204_logo.png b/tests/common/res/drawable-xhdpi/ch_204_logo.png
index 8e8582c6..8e8582c6 100644
--- a/tests/input/res/drawable-xhdpi/ch_204_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_204_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_205_logo.png b/tests/common/res/drawable-xhdpi/ch_205_logo.png
index 4e3f4d94..4e3f4d94 100644
--- a/tests/input/res/drawable-xhdpi/ch_205_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_205_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_206_logo.png b/tests/common/res/drawable-xhdpi/ch_206_logo.png
index 584bb98c..584bb98c 100644
--- a/tests/input/res/drawable-xhdpi/ch_206_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_206_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_207_logo.png b/tests/common/res/drawable-xhdpi/ch_207_logo.png
index e6b2748e..e6b2748e 100644
--- a/tests/input/res/drawable-xhdpi/ch_207_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_207_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_208_logo.png b/tests/common/res/drawable-xhdpi/ch_208_logo.png
index 5a18dcad..5a18dcad 100644
--- a/tests/input/res/drawable-xhdpi/ch_208_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_208_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_209_logo.png b/tests/common/res/drawable-xhdpi/ch_209_logo.png
index c4de3050..c4de3050 100644
--- a/tests/input/res/drawable-xhdpi/ch_209_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_209_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_20_logo.png b/tests/common/res/drawable-xhdpi/ch_20_logo.png
index 6b4d6104..6b4d6104 100644
--- a/tests/input/res/drawable-xhdpi/ch_20_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_20_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_210_logo.png b/tests/common/res/drawable-xhdpi/ch_210_logo.png
index e4eed085..e4eed085 100644
--- a/tests/input/res/drawable-xhdpi/ch_210_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_210_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_211_logo.png b/tests/common/res/drawable-xhdpi/ch_211_logo.png
index d5881047..d5881047 100644
--- a/tests/input/res/drawable-xhdpi/ch_211_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_211_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_212_logo.png b/tests/common/res/drawable-xhdpi/ch_212_logo.png
index c849f6f2..c849f6f2 100644
--- a/tests/input/res/drawable-xhdpi/ch_212_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_212_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_213_logo.png b/tests/common/res/drawable-xhdpi/ch_213_logo.png
index 92def1c5..92def1c5 100644
--- a/tests/input/res/drawable-xhdpi/ch_213_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_213_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_214_logo.png b/tests/common/res/drawable-xhdpi/ch_214_logo.png
index 51f749fd..51f749fd 100644
--- a/tests/input/res/drawable-xhdpi/ch_214_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_214_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_215_logo.png b/tests/common/res/drawable-xhdpi/ch_215_logo.png
index 5425aaad..5425aaad 100644
--- a/tests/input/res/drawable-xhdpi/ch_215_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_215_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_216_logo.png b/tests/common/res/drawable-xhdpi/ch_216_logo.png
index 53fed3c2..53fed3c2 100644
--- a/tests/input/res/drawable-xhdpi/ch_216_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_216_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_217_logo.png b/tests/common/res/drawable-xhdpi/ch_217_logo.png
index d253f9cd..d253f9cd 100644
--- a/tests/input/res/drawable-xhdpi/ch_217_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_217_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_218_logo.png b/tests/common/res/drawable-xhdpi/ch_218_logo.png
index 3c7b0698..3c7b0698 100644
--- a/tests/input/res/drawable-xhdpi/ch_218_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_218_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_219_logo.png b/tests/common/res/drawable-xhdpi/ch_219_logo.png
index 7b96dd6e..7b96dd6e 100644
--- a/tests/input/res/drawable-xhdpi/ch_219_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_219_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_21_logo.png b/tests/common/res/drawable-xhdpi/ch_21_logo.png
index f2848346..f2848346 100644
--- a/tests/input/res/drawable-xhdpi/ch_21_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_21_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_220_logo.png b/tests/common/res/drawable-xhdpi/ch_220_logo.png
index f9d20884..f9d20884 100644
--- a/tests/input/res/drawable-xhdpi/ch_220_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_220_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_221_logo.png b/tests/common/res/drawable-xhdpi/ch_221_logo.png
index 9213142d..9213142d 100644
--- a/tests/input/res/drawable-xhdpi/ch_221_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_221_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_222_logo.png b/tests/common/res/drawable-xhdpi/ch_222_logo.png
index 66cb9a8b..66cb9a8b 100644
--- a/tests/input/res/drawable-xhdpi/ch_222_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_222_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_223_logo.png b/tests/common/res/drawable-xhdpi/ch_223_logo.png
index 11a44724..11a44724 100644
--- a/tests/input/res/drawable-xhdpi/ch_223_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_223_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_224_logo.png b/tests/common/res/drawable-xhdpi/ch_224_logo.png
index cdba6bf5..cdba6bf5 100644
--- a/tests/input/res/drawable-xhdpi/ch_224_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_224_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_225_logo.png b/tests/common/res/drawable-xhdpi/ch_225_logo.png
index e9416bfd..e9416bfd 100644
--- a/tests/input/res/drawable-xhdpi/ch_225_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_225_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_226_logo.png b/tests/common/res/drawable-xhdpi/ch_226_logo.png
index 88792532..88792532 100644
--- a/tests/input/res/drawable-xhdpi/ch_226_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_226_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_227_logo.png b/tests/common/res/drawable-xhdpi/ch_227_logo.png
index 7ae8205b..7ae8205b 100644
--- a/tests/input/res/drawable-xhdpi/ch_227_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_227_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_228_logo.png b/tests/common/res/drawable-xhdpi/ch_228_logo.png
index 718d93e2..718d93e2 100644
--- a/tests/input/res/drawable-xhdpi/ch_228_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_228_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_229_logo.png b/tests/common/res/drawable-xhdpi/ch_229_logo.png
index eb4f9129..eb4f9129 100644
--- a/tests/input/res/drawable-xhdpi/ch_229_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_229_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_22_logo.png b/tests/common/res/drawable-xhdpi/ch_22_logo.png
index 9aa987d1..9aa987d1 100644
--- a/tests/input/res/drawable-xhdpi/ch_22_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_22_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_230_logo.png b/tests/common/res/drawable-xhdpi/ch_230_logo.png
index a1bb57d3..a1bb57d3 100644
--- a/tests/input/res/drawable-xhdpi/ch_230_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_230_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_231_logo.png b/tests/common/res/drawable-xhdpi/ch_231_logo.png
index e748e868..e748e868 100644
--- a/tests/input/res/drawable-xhdpi/ch_231_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_231_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_232_logo.png b/tests/common/res/drawable-xhdpi/ch_232_logo.png
index 5d4f1d69..5d4f1d69 100644
--- a/tests/input/res/drawable-xhdpi/ch_232_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_232_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_233_logo.png b/tests/common/res/drawable-xhdpi/ch_233_logo.png
index 7ff780ab..7ff780ab 100644
--- a/tests/input/res/drawable-xhdpi/ch_233_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_233_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_234_logo.png b/tests/common/res/drawable-xhdpi/ch_234_logo.png
index a4e10dfb..a4e10dfb 100644
--- a/tests/input/res/drawable-xhdpi/ch_234_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_234_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_235_logo.png b/tests/common/res/drawable-xhdpi/ch_235_logo.png
index c318ac0b..c318ac0b 100644
--- a/tests/input/res/drawable-xhdpi/ch_235_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_235_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_236_logo.png b/tests/common/res/drawable-xhdpi/ch_236_logo.png
index 2ab86fd6..2ab86fd6 100644
--- a/tests/input/res/drawable-xhdpi/ch_236_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_236_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_237_logo.png b/tests/common/res/drawable-xhdpi/ch_237_logo.png
index 04fa9d61..04fa9d61 100644
--- a/tests/input/res/drawable-xhdpi/ch_237_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_237_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_238_logo.png b/tests/common/res/drawable-xhdpi/ch_238_logo.png
index 6649b9db..6649b9db 100644
--- a/tests/input/res/drawable-xhdpi/ch_238_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_238_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_239_logo.png b/tests/common/res/drawable-xhdpi/ch_239_logo.png
index 6eaf887d..6eaf887d 100644
--- a/tests/input/res/drawable-xhdpi/ch_239_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_239_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_23_logo.png b/tests/common/res/drawable-xhdpi/ch_23_logo.png
index c3dcf172..c3dcf172 100644
--- a/tests/input/res/drawable-xhdpi/ch_23_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_23_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_240_logo.png b/tests/common/res/drawable-xhdpi/ch_240_logo.png
index 50d0d0df..50d0d0df 100644
--- a/tests/input/res/drawable-xhdpi/ch_240_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_240_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_241_logo.png b/tests/common/res/drawable-xhdpi/ch_241_logo.png
index 779d53b5..779d53b5 100644
--- a/tests/input/res/drawable-xhdpi/ch_241_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_241_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_242_logo.png b/tests/common/res/drawable-xhdpi/ch_242_logo.png
index 717aaae5..717aaae5 100644
--- a/tests/input/res/drawable-xhdpi/ch_242_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_242_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_243_logo.png b/tests/common/res/drawable-xhdpi/ch_243_logo.png
index fd04b2a2..fd04b2a2 100644
--- a/tests/input/res/drawable-xhdpi/ch_243_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_243_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_244_logo.png b/tests/common/res/drawable-xhdpi/ch_244_logo.png
index d8b1b710..d8b1b710 100644
--- a/tests/input/res/drawable-xhdpi/ch_244_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_244_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_245_logo.png b/tests/common/res/drawable-xhdpi/ch_245_logo.png
index 3a08f595..3a08f595 100644
--- a/tests/input/res/drawable-xhdpi/ch_245_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_245_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_246_logo.png b/tests/common/res/drawable-xhdpi/ch_246_logo.png
index 404bd8f0..404bd8f0 100644
--- a/tests/input/res/drawable-xhdpi/ch_246_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_246_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_247_logo.png b/tests/common/res/drawable-xhdpi/ch_247_logo.png
index 46ee0163..46ee0163 100644
--- a/tests/input/res/drawable-xhdpi/ch_247_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_247_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_248_logo.png b/tests/common/res/drawable-xhdpi/ch_248_logo.png
index ebfeb6d8..ebfeb6d8 100644
--- a/tests/input/res/drawable-xhdpi/ch_248_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_248_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_249_logo.png b/tests/common/res/drawable-xhdpi/ch_249_logo.png
index f49dc8c4..f49dc8c4 100644
--- a/tests/input/res/drawable-xhdpi/ch_249_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_249_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_24_logo.png b/tests/common/res/drawable-xhdpi/ch_24_logo.png
index 8fda8dcc..8fda8dcc 100644
--- a/tests/input/res/drawable-xhdpi/ch_24_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_24_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_250_logo.png b/tests/common/res/drawable-xhdpi/ch_250_logo.png
index 3c464624..3c464624 100644
--- a/tests/input/res/drawable-xhdpi/ch_250_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_250_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_251_logo.png b/tests/common/res/drawable-xhdpi/ch_251_logo.png
index 58f3f7d2..58f3f7d2 100644
--- a/tests/input/res/drawable-xhdpi/ch_251_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_251_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_252_logo.png b/tests/common/res/drawable-xhdpi/ch_252_logo.png
index f0284549..f0284549 100644
--- a/tests/input/res/drawable-xhdpi/ch_252_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_252_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_253_logo.png b/tests/common/res/drawable-xhdpi/ch_253_logo.png
index 47a8f91d..47a8f91d 100644
--- a/tests/input/res/drawable-xhdpi/ch_253_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_253_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_254_logo.png b/tests/common/res/drawable-xhdpi/ch_254_logo.png
index e2505fc0..e2505fc0 100644
--- a/tests/input/res/drawable-xhdpi/ch_254_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_254_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_255_logo.png b/tests/common/res/drawable-xhdpi/ch_255_logo.png
index 55e7116b..55e7116b 100644
--- a/tests/input/res/drawable-xhdpi/ch_255_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_255_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_256_logo.png b/tests/common/res/drawable-xhdpi/ch_256_logo.png
index d31964ab..d31964ab 100644
--- a/tests/input/res/drawable-xhdpi/ch_256_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_256_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_257_logo.png b/tests/common/res/drawable-xhdpi/ch_257_logo.png
index cf850f90..cf850f90 100644
--- a/tests/input/res/drawable-xhdpi/ch_257_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_257_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_258_logo.png b/tests/common/res/drawable-xhdpi/ch_258_logo.png
index 148d0ee4..148d0ee4 100644
--- a/tests/input/res/drawable-xhdpi/ch_258_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_258_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_259_logo.png b/tests/common/res/drawable-xhdpi/ch_259_logo.png
index aa84697d..aa84697d 100644
--- a/tests/input/res/drawable-xhdpi/ch_259_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_259_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_25_logo.png b/tests/common/res/drawable-xhdpi/ch_25_logo.png
index 401e785e..401e785e 100644
--- a/tests/input/res/drawable-xhdpi/ch_25_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_25_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_260_logo.png b/tests/common/res/drawable-xhdpi/ch_260_logo.png
index dc4f67f7..dc4f67f7 100644
--- a/tests/input/res/drawable-xhdpi/ch_260_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_260_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_261_logo.png b/tests/common/res/drawable-xhdpi/ch_261_logo.png
index dfbecb37..dfbecb37 100644
--- a/tests/input/res/drawable-xhdpi/ch_261_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_261_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_262_logo.png b/tests/common/res/drawable-xhdpi/ch_262_logo.png
index 2fa3185b..2fa3185b 100644
--- a/tests/input/res/drawable-xhdpi/ch_262_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_262_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_263_logo.png b/tests/common/res/drawable-xhdpi/ch_263_logo.png
index d1e84b38..d1e84b38 100644
--- a/tests/input/res/drawable-xhdpi/ch_263_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_263_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_264_logo.png b/tests/common/res/drawable-xhdpi/ch_264_logo.png
index 3f52decb..3f52decb 100644
--- a/tests/input/res/drawable-xhdpi/ch_264_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_264_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_265_logo.png b/tests/common/res/drawable-xhdpi/ch_265_logo.png
index f60c362a..f60c362a 100644
--- a/tests/input/res/drawable-xhdpi/ch_265_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_265_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_266_logo.png b/tests/common/res/drawable-xhdpi/ch_266_logo.png
index 94dc4463..94dc4463 100644
--- a/tests/input/res/drawable-xhdpi/ch_266_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_266_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_267_logo.png b/tests/common/res/drawable-xhdpi/ch_267_logo.png
index 48ac79ed..48ac79ed 100644
--- a/tests/input/res/drawable-xhdpi/ch_267_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_267_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_268_logo.png b/tests/common/res/drawable-xhdpi/ch_268_logo.png
index b6f1ad64..b6f1ad64 100644
--- a/tests/input/res/drawable-xhdpi/ch_268_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_268_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_269_logo.png b/tests/common/res/drawable-xhdpi/ch_269_logo.png
index 0d98d378..0d98d378 100644
--- a/tests/input/res/drawable-xhdpi/ch_269_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_269_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_26_logo.png b/tests/common/res/drawable-xhdpi/ch_26_logo.png
index a8835e4a..a8835e4a 100644
--- a/tests/input/res/drawable-xhdpi/ch_26_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_26_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_270_logo.png b/tests/common/res/drawable-xhdpi/ch_270_logo.png
index 27a0aead..27a0aead 100644
--- a/tests/input/res/drawable-xhdpi/ch_270_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_270_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_271_logo.png b/tests/common/res/drawable-xhdpi/ch_271_logo.png
index 7fa6feb3..7fa6feb3 100644
--- a/tests/input/res/drawable-xhdpi/ch_271_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_271_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_272_logo.png b/tests/common/res/drawable-xhdpi/ch_272_logo.png
index af7e34e6..af7e34e6 100644
--- a/tests/input/res/drawable-xhdpi/ch_272_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_272_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_273_logo.png b/tests/common/res/drawable-xhdpi/ch_273_logo.png
index a8a041af..a8a041af 100644
--- a/tests/input/res/drawable-xhdpi/ch_273_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_273_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_274_logo.png b/tests/common/res/drawable-xhdpi/ch_274_logo.png
index 0f498f23..0f498f23 100644
--- a/tests/input/res/drawable-xhdpi/ch_274_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_274_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_275_logo.png b/tests/common/res/drawable-xhdpi/ch_275_logo.png
index d598fb35..d598fb35 100644
--- a/tests/input/res/drawable-xhdpi/ch_275_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_275_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_276_logo.png b/tests/common/res/drawable-xhdpi/ch_276_logo.png
index 7cbac69a..7cbac69a 100644
--- a/tests/input/res/drawable-xhdpi/ch_276_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_276_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_277_logo.png b/tests/common/res/drawable-xhdpi/ch_277_logo.png
index 70a7f3ea..70a7f3ea 100644
--- a/tests/input/res/drawable-xhdpi/ch_277_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_277_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_278_logo.png b/tests/common/res/drawable-xhdpi/ch_278_logo.png
index fcb332a5..fcb332a5 100644
--- a/tests/input/res/drawable-xhdpi/ch_278_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_278_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_279_logo.png b/tests/common/res/drawable-xhdpi/ch_279_logo.png
index a95b4a96..a95b4a96 100644
--- a/tests/input/res/drawable-xhdpi/ch_279_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_279_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_27_logo.png b/tests/common/res/drawable-xhdpi/ch_27_logo.png
index 138b7dc8..138b7dc8 100644
--- a/tests/input/res/drawable-xhdpi/ch_27_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_27_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_280_logo.png b/tests/common/res/drawable-xhdpi/ch_280_logo.png
index 2f862b39..2f862b39 100644
--- a/tests/input/res/drawable-xhdpi/ch_280_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_280_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_281_logo.png b/tests/common/res/drawable-xhdpi/ch_281_logo.png
index 6d888d16..6d888d16 100644
--- a/tests/input/res/drawable-xhdpi/ch_281_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_281_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_282_logo.png b/tests/common/res/drawable-xhdpi/ch_282_logo.png
index 81db1656..81db1656 100644
--- a/tests/input/res/drawable-xhdpi/ch_282_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_282_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_283_logo.png b/tests/common/res/drawable-xhdpi/ch_283_logo.png
index 4933bc3c..4933bc3c 100644
--- a/tests/input/res/drawable-xhdpi/ch_283_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_283_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_284_logo.png b/tests/common/res/drawable-xhdpi/ch_284_logo.png
index b4880b8b..b4880b8b 100644
--- a/tests/input/res/drawable-xhdpi/ch_284_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_284_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_285_logo.png b/tests/common/res/drawable-xhdpi/ch_285_logo.png
index eea6175e..eea6175e 100644
--- a/tests/input/res/drawable-xhdpi/ch_285_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_285_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_286_logo.png b/tests/common/res/drawable-xhdpi/ch_286_logo.png
index d2b5b5bd..d2b5b5bd 100644
--- a/tests/input/res/drawable-xhdpi/ch_286_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_286_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_287_logo.png b/tests/common/res/drawable-xhdpi/ch_287_logo.png
index f374d9d0..f374d9d0 100644
--- a/tests/input/res/drawable-xhdpi/ch_287_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_287_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_288_logo.png b/tests/common/res/drawable-xhdpi/ch_288_logo.png
index 16072cfa..16072cfa 100644
--- a/tests/input/res/drawable-xhdpi/ch_288_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_288_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_289_logo.png b/tests/common/res/drawable-xhdpi/ch_289_logo.png
index b76c2f48..b76c2f48 100644
--- a/tests/input/res/drawable-xhdpi/ch_289_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_289_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_28_logo.png b/tests/common/res/drawable-xhdpi/ch_28_logo.png
index 284301b0..284301b0 100644
--- a/tests/input/res/drawable-xhdpi/ch_28_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_28_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_290_logo.png b/tests/common/res/drawable-xhdpi/ch_290_logo.png
index 2778664f..2778664f 100644
--- a/tests/input/res/drawable-xhdpi/ch_290_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_290_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_291_logo.png b/tests/common/res/drawable-xhdpi/ch_291_logo.png
index 52da29f6..52da29f6 100644
--- a/tests/input/res/drawable-xhdpi/ch_291_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_291_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_292_logo.png b/tests/common/res/drawable-xhdpi/ch_292_logo.png
index a1d8e6f8..a1d8e6f8 100644
--- a/tests/input/res/drawable-xhdpi/ch_292_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_292_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_293_logo.png b/tests/common/res/drawable-xhdpi/ch_293_logo.png
index 74020c30..74020c30 100644
--- a/tests/input/res/drawable-xhdpi/ch_293_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_293_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_294_logo.png b/tests/common/res/drawable-xhdpi/ch_294_logo.png
index 49d72b5d..49d72b5d 100644
--- a/tests/input/res/drawable-xhdpi/ch_294_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_294_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_295_logo.png b/tests/common/res/drawable-xhdpi/ch_295_logo.png
index cae47aeb..cae47aeb 100644
--- a/tests/input/res/drawable-xhdpi/ch_295_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_295_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_296_logo.png b/tests/common/res/drawable-xhdpi/ch_296_logo.png
index 4b38d480..4b38d480 100644
--- a/tests/input/res/drawable-xhdpi/ch_296_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_296_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_297_logo.png b/tests/common/res/drawable-xhdpi/ch_297_logo.png
index 3edd15d0..3edd15d0 100644
--- a/tests/input/res/drawable-xhdpi/ch_297_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_297_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_298_logo.png b/tests/common/res/drawable-xhdpi/ch_298_logo.png
index cb472f31..cb472f31 100644
--- a/tests/input/res/drawable-xhdpi/ch_298_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_298_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_299_logo.png b/tests/common/res/drawable-xhdpi/ch_299_logo.png
index b672881e..b672881e 100644
--- a/tests/input/res/drawable-xhdpi/ch_299_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_299_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_29_logo.png b/tests/common/res/drawable-xhdpi/ch_29_logo.png
index 9f1c523f..9f1c523f 100644
--- a/tests/input/res/drawable-xhdpi/ch_29_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_29_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_2_logo.png b/tests/common/res/drawable-xhdpi/ch_2_logo.png
index d6887b05..d6887b05 100644
--- a/tests/input/res/drawable-xhdpi/ch_2_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_2_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_300_logo.png b/tests/common/res/drawable-xhdpi/ch_300_logo.png
index 9b842d77..9b842d77 100644
--- a/tests/input/res/drawable-xhdpi/ch_300_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_300_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_301_logo.png b/tests/common/res/drawable-xhdpi/ch_301_logo.png
index 4c7fda85..4c7fda85 100644
--- a/tests/input/res/drawable-xhdpi/ch_301_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_301_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_302_logo.png b/tests/common/res/drawable-xhdpi/ch_302_logo.png
index e39f5acb..e39f5acb 100644
--- a/tests/input/res/drawable-xhdpi/ch_302_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_302_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_303_logo.png b/tests/common/res/drawable-xhdpi/ch_303_logo.png
index 78f057f7..78f057f7 100644
--- a/tests/input/res/drawable-xhdpi/ch_303_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_303_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_304_logo.png b/tests/common/res/drawable-xhdpi/ch_304_logo.png
index b8a68630..b8a68630 100644
--- a/tests/input/res/drawable-xhdpi/ch_304_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_304_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_305_logo.png b/tests/common/res/drawable-xhdpi/ch_305_logo.png
index 7f698610..7f698610 100644
--- a/tests/input/res/drawable-xhdpi/ch_305_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_305_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_306_logo.png b/tests/common/res/drawable-xhdpi/ch_306_logo.png
index 0458b383..0458b383 100644
--- a/tests/input/res/drawable-xhdpi/ch_306_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_306_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_307_logo.png b/tests/common/res/drawable-xhdpi/ch_307_logo.png
index f2a35cd5..f2a35cd5 100644
--- a/tests/input/res/drawable-xhdpi/ch_307_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_307_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_308_logo.png b/tests/common/res/drawable-xhdpi/ch_308_logo.png
index 49d2b4b3..49d2b4b3 100644
--- a/tests/input/res/drawable-xhdpi/ch_308_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_308_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_309_logo.png b/tests/common/res/drawable-xhdpi/ch_309_logo.png
index 81da237b..81da237b 100644
--- a/tests/input/res/drawable-xhdpi/ch_309_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_309_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_30_logo.png b/tests/common/res/drawable-xhdpi/ch_30_logo.png
index 72db9c52..72db9c52 100644
--- a/tests/input/res/drawable-xhdpi/ch_30_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_30_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_310_logo.png b/tests/common/res/drawable-xhdpi/ch_310_logo.png
index 901a9113..901a9113 100644
--- a/tests/input/res/drawable-xhdpi/ch_310_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_310_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_311_logo.png b/tests/common/res/drawable-xhdpi/ch_311_logo.png
index 0aa3b284..0aa3b284 100644
--- a/tests/input/res/drawable-xhdpi/ch_311_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_311_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_312_logo.png b/tests/common/res/drawable-xhdpi/ch_312_logo.png
index 0cfead7e..0cfead7e 100644
--- a/tests/input/res/drawable-xhdpi/ch_312_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_312_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_313_logo.png b/tests/common/res/drawable-xhdpi/ch_313_logo.png
index b552c871..b552c871 100644
--- a/tests/input/res/drawable-xhdpi/ch_313_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_313_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_314_logo.png b/tests/common/res/drawable-xhdpi/ch_314_logo.png
index 354ab843..354ab843 100644
--- a/tests/input/res/drawable-xhdpi/ch_314_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_314_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_315_logo.png b/tests/common/res/drawable-xhdpi/ch_315_logo.png
index 2db60cca..2db60cca 100644
--- a/tests/input/res/drawable-xhdpi/ch_315_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_315_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_316_logo.png b/tests/common/res/drawable-xhdpi/ch_316_logo.png
index da4d32a3..da4d32a3 100644
--- a/tests/input/res/drawable-xhdpi/ch_316_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_316_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_317_logo.png b/tests/common/res/drawable-xhdpi/ch_317_logo.png
index d344ef36..d344ef36 100644
--- a/tests/input/res/drawable-xhdpi/ch_317_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_317_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_318_logo.png b/tests/common/res/drawable-xhdpi/ch_318_logo.png
index 9150c2b1..9150c2b1 100644
--- a/tests/input/res/drawable-xhdpi/ch_318_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_318_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_319_logo.png b/tests/common/res/drawable-xhdpi/ch_319_logo.png
index 4b1b7c9d..4b1b7c9d 100644
--- a/tests/input/res/drawable-xhdpi/ch_319_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_319_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_31_logo.png b/tests/common/res/drawable-xhdpi/ch_31_logo.png
index 5386601d..5386601d 100644
--- a/tests/input/res/drawable-xhdpi/ch_31_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_31_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_320_logo.png b/tests/common/res/drawable-xhdpi/ch_320_logo.png
index 4efe21d4..4efe21d4 100644
--- a/tests/input/res/drawable-xhdpi/ch_320_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_320_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_321_logo.png b/tests/common/res/drawable-xhdpi/ch_321_logo.png
index d523277d..d523277d 100644
--- a/tests/input/res/drawable-xhdpi/ch_321_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_321_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_322_logo.png b/tests/common/res/drawable-xhdpi/ch_322_logo.png
index cf2500dc..cf2500dc 100644
--- a/tests/input/res/drawable-xhdpi/ch_322_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_322_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_323_logo.png b/tests/common/res/drawable-xhdpi/ch_323_logo.png
index e838c0c1..e838c0c1 100644
--- a/tests/input/res/drawable-xhdpi/ch_323_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_323_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_324_logo.png b/tests/common/res/drawable-xhdpi/ch_324_logo.png
index cc0cf6d2..cc0cf6d2 100644
--- a/tests/input/res/drawable-xhdpi/ch_324_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_324_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_325_logo.png b/tests/common/res/drawable-xhdpi/ch_325_logo.png
index adfda884..adfda884 100644
--- a/tests/input/res/drawable-xhdpi/ch_325_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_325_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_326_logo.png b/tests/common/res/drawable-xhdpi/ch_326_logo.png
index 434d2cd6..434d2cd6 100644
--- a/tests/input/res/drawable-xhdpi/ch_326_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_326_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_327_logo.png b/tests/common/res/drawable-xhdpi/ch_327_logo.png
index 0a7f0b95..0a7f0b95 100644
--- a/tests/input/res/drawable-xhdpi/ch_327_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_327_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_328_logo.png b/tests/common/res/drawable-xhdpi/ch_328_logo.png
index 77129370..77129370 100644
--- a/tests/input/res/drawable-xhdpi/ch_328_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_328_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_329_logo.png b/tests/common/res/drawable-xhdpi/ch_329_logo.png
index 9ff0a89f..9ff0a89f 100644
--- a/tests/input/res/drawable-xhdpi/ch_329_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_329_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_32_logo.png b/tests/common/res/drawable-xhdpi/ch_32_logo.png
index 39351ac1..39351ac1 100644
--- a/tests/input/res/drawable-xhdpi/ch_32_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_32_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_330_logo.png b/tests/common/res/drawable-xhdpi/ch_330_logo.png
index 54adc2e7..54adc2e7 100644
--- a/tests/input/res/drawable-xhdpi/ch_330_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_330_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_331_logo.png b/tests/common/res/drawable-xhdpi/ch_331_logo.png
index 6c29286f..6c29286f 100644
--- a/tests/input/res/drawable-xhdpi/ch_331_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_331_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_332_logo.png b/tests/common/res/drawable-xhdpi/ch_332_logo.png
index ccab9144..ccab9144 100644
--- a/tests/input/res/drawable-xhdpi/ch_332_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_332_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_333_logo.png b/tests/common/res/drawable-xhdpi/ch_333_logo.png
index a35ce116..a35ce116 100644
--- a/tests/input/res/drawable-xhdpi/ch_333_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_333_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_334_logo.png b/tests/common/res/drawable-xhdpi/ch_334_logo.png
index a191d804..a191d804 100644
--- a/tests/input/res/drawable-xhdpi/ch_334_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_334_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_335_logo.png b/tests/common/res/drawable-xhdpi/ch_335_logo.png
index a5680b24..a5680b24 100644
--- a/tests/input/res/drawable-xhdpi/ch_335_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_335_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_336_logo.png b/tests/common/res/drawable-xhdpi/ch_336_logo.png
index 42292bf8..42292bf8 100644
--- a/tests/input/res/drawable-xhdpi/ch_336_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_336_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_337_logo.png b/tests/common/res/drawable-xhdpi/ch_337_logo.png
index d231fca3..d231fca3 100644
--- a/tests/input/res/drawable-xhdpi/ch_337_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_337_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_338_logo.png b/tests/common/res/drawable-xhdpi/ch_338_logo.png
index 000988ab..000988ab 100644
--- a/tests/input/res/drawable-xhdpi/ch_338_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_338_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_339_logo.png b/tests/common/res/drawable-xhdpi/ch_339_logo.png
index 3150c92c..3150c92c 100644
--- a/tests/input/res/drawable-xhdpi/ch_339_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_339_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_33_logo.png b/tests/common/res/drawable-xhdpi/ch_33_logo.png
index 4931e205..4931e205 100644
--- a/tests/input/res/drawable-xhdpi/ch_33_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_33_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_340_logo.png b/tests/common/res/drawable-xhdpi/ch_340_logo.png
index d35d772e..d35d772e 100644
--- a/tests/input/res/drawable-xhdpi/ch_340_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_340_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_341_logo.png b/tests/common/res/drawable-xhdpi/ch_341_logo.png
index 3ad19a0b..3ad19a0b 100644
--- a/tests/input/res/drawable-xhdpi/ch_341_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_341_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_342_logo.png b/tests/common/res/drawable-xhdpi/ch_342_logo.png
index 8d6cad2c..8d6cad2c 100644
--- a/tests/input/res/drawable-xhdpi/ch_342_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_342_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_343_logo.png b/tests/common/res/drawable-xhdpi/ch_343_logo.png
index 6e16dc96..6e16dc96 100644
--- a/tests/input/res/drawable-xhdpi/ch_343_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_343_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_344_logo.png b/tests/common/res/drawable-xhdpi/ch_344_logo.png
index e66c5a19..e66c5a19 100644
--- a/tests/input/res/drawable-xhdpi/ch_344_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_344_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_345_logo.png b/tests/common/res/drawable-xhdpi/ch_345_logo.png
index ed451fde..ed451fde 100644
--- a/tests/input/res/drawable-xhdpi/ch_345_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_345_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_346_logo.png b/tests/common/res/drawable-xhdpi/ch_346_logo.png
index 31059671..31059671 100644
--- a/tests/input/res/drawable-xhdpi/ch_346_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_346_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_347_logo.png b/tests/common/res/drawable-xhdpi/ch_347_logo.png
index 65ee51eb..65ee51eb 100644
--- a/tests/input/res/drawable-xhdpi/ch_347_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_347_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_348_logo.png b/tests/common/res/drawable-xhdpi/ch_348_logo.png
index 54e9cca7..54e9cca7 100644
--- a/tests/input/res/drawable-xhdpi/ch_348_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_348_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_349_logo.png b/tests/common/res/drawable-xhdpi/ch_349_logo.png
index 7a11ae34..7a11ae34 100644
--- a/tests/input/res/drawable-xhdpi/ch_349_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_349_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_34_logo.png b/tests/common/res/drawable-xhdpi/ch_34_logo.png
index 27a217e8..27a217e8 100644
--- a/tests/input/res/drawable-xhdpi/ch_34_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_34_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_350_logo.png b/tests/common/res/drawable-xhdpi/ch_350_logo.png
index 5c486ab7..5c486ab7 100644
--- a/tests/input/res/drawable-xhdpi/ch_350_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_350_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_351_logo.png b/tests/common/res/drawable-xhdpi/ch_351_logo.png
index 17fff276..17fff276 100644
--- a/tests/input/res/drawable-xhdpi/ch_351_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_351_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_352_logo.png b/tests/common/res/drawable-xhdpi/ch_352_logo.png
index 2d9c412c..2d9c412c 100644
--- a/tests/input/res/drawable-xhdpi/ch_352_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_352_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_353_logo.png b/tests/common/res/drawable-xhdpi/ch_353_logo.png
index 38c76b38..38c76b38 100644
--- a/tests/input/res/drawable-xhdpi/ch_353_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_353_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_354_logo.png b/tests/common/res/drawable-xhdpi/ch_354_logo.png
index 8ea7d467..8ea7d467 100644
--- a/tests/input/res/drawable-xhdpi/ch_354_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_354_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_355_logo.png b/tests/common/res/drawable-xhdpi/ch_355_logo.png
index 0c94dcf6..0c94dcf6 100644
--- a/tests/input/res/drawable-xhdpi/ch_355_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_355_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_356_logo.png b/tests/common/res/drawable-xhdpi/ch_356_logo.png
index 3f2b288a..3f2b288a 100644
--- a/tests/input/res/drawable-xhdpi/ch_356_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_356_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_357_logo.png b/tests/common/res/drawable-xhdpi/ch_357_logo.png
index 63d43c31..63d43c31 100644
--- a/tests/input/res/drawable-xhdpi/ch_357_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_357_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_358_logo.png b/tests/common/res/drawable-xhdpi/ch_358_logo.png
index 1f5771fe..1f5771fe 100644
--- a/tests/input/res/drawable-xhdpi/ch_358_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_358_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_359_logo.png b/tests/common/res/drawable-xhdpi/ch_359_logo.png
index 7a4114bd..7a4114bd 100644
--- a/tests/input/res/drawable-xhdpi/ch_359_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_359_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_35_logo.png b/tests/common/res/drawable-xhdpi/ch_35_logo.png
index af2cae5d..af2cae5d 100644
--- a/tests/input/res/drawable-xhdpi/ch_35_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_35_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_360_logo.png b/tests/common/res/drawable-xhdpi/ch_360_logo.png
index 4e49a1f9..4e49a1f9 100644
--- a/tests/input/res/drawable-xhdpi/ch_360_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_360_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_361_logo.png b/tests/common/res/drawable-xhdpi/ch_361_logo.png
index 43b16ac6..43b16ac6 100644
--- a/tests/input/res/drawable-xhdpi/ch_361_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_361_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_362_logo.png b/tests/common/res/drawable-xhdpi/ch_362_logo.png
index efb32dab..efb32dab 100644
--- a/tests/input/res/drawable-xhdpi/ch_362_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_362_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_363_logo.png b/tests/common/res/drawable-xhdpi/ch_363_logo.png
index c59eb0b3..c59eb0b3 100644
--- a/tests/input/res/drawable-xhdpi/ch_363_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_363_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_364_logo.png b/tests/common/res/drawable-xhdpi/ch_364_logo.png
index 9d649d47..9d649d47 100644
--- a/tests/input/res/drawable-xhdpi/ch_364_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_364_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_365_logo.png b/tests/common/res/drawable-xhdpi/ch_365_logo.png
index 96cae282..96cae282 100644
--- a/tests/input/res/drawable-xhdpi/ch_365_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_365_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_366_logo.png b/tests/common/res/drawable-xhdpi/ch_366_logo.png
index 3c3a5cf6..3c3a5cf6 100644
--- a/tests/input/res/drawable-xhdpi/ch_366_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_366_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_367_logo.png b/tests/common/res/drawable-xhdpi/ch_367_logo.png
index 7467625a..7467625a 100644
--- a/tests/input/res/drawable-xhdpi/ch_367_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_367_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_368_logo.png b/tests/common/res/drawable-xhdpi/ch_368_logo.png
index adb62ffc..adb62ffc 100644
--- a/tests/input/res/drawable-xhdpi/ch_368_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_368_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_369_logo.png b/tests/common/res/drawable-xhdpi/ch_369_logo.png
index 773f6c5c..773f6c5c 100644
--- a/tests/input/res/drawable-xhdpi/ch_369_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_369_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_36_logo.png b/tests/common/res/drawable-xhdpi/ch_36_logo.png
index 4580833f..4580833f 100644
--- a/tests/input/res/drawable-xhdpi/ch_36_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_36_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_370_logo.png b/tests/common/res/drawable-xhdpi/ch_370_logo.png
index d60583bc..d60583bc 100644
--- a/tests/input/res/drawable-xhdpi/ch_370_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_370_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_371_logo.png b/tests/common/res/drawable-xhdpi/ch_371_logo.png
index 91958a07..91958a07 100644
--- a/tests/input/res/drawable-xhdpi/ch_371_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_371_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_372_logo.png b/tests/common/res/drawable-xhdpi/ch_372_logo.png
index 4b2d757c..4b2d757c 100644
--- a/tests/input/res/drawable-xhdpi/ch_372_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_372_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_373_logo.png b/tests/common/res/drawable-xhdpi/ch_373_logo.png
index f8aae527..f8aae527 100644
--- a/tests/input/res/drawable-xhdpi/ch_373_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_373_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_374_logo.png b/tests/common/res/drawable-xhdpi/ch_374_logo.png
index 3549da94..3549da94 100644
--- a/tests/input/res/drawable-xhdpi/ch_374_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_374_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_375_logo.png b/tests/common/res/drawable-xhdpi/ch_375_logo.png
index c19806e8..c19806e8 100644
--- a/tests/input/res/drawable-xhdpi/ch_375_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_375_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_376_logo.png b/tests/common/res/drawable-xhdpi/ch_376_logo.png
index 86144b73..86144b73 100644
--- a/tests/input/res/drawable-xhdpi/ch_376_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_376_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_377_logo.png b/tests/common/res/drawable-xhdpi/ch_377_logo.png
index 74f693c1..74f693c1 100644
--- a/tests/input/res/drawable-xhdpi/ch_377_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_377_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_378_logo.png b/tests/common/res/drawable-xhdpi/ch_378_logo.png
index 40253dab..40253dab 100644
--- a/tests/input/res/drawable-xhdpi/ch_378_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_378_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_379_logo.png b/tests/common/res/drawable-xhdpi/ch_379_logo.png
index 5459058f..5459058f 100644
--- a/tests/input/res/drawable-xhdpi/ch_379_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_379_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_37_logo.png b/tests/common/res/drawable-xhdpi/ch_37_logo.png
index 7fce3b4d..7fce3b4d 100644
--- a/tests/input/res/drawable-xhdpi/ch_37_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_37_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_380_logo.png b/tests/common/res/drawable-xhdpi/ch_380_logo.png
index a47a40d8..a47a40d8 100644
--- a/tests/input/res/drawable-xhdpi/ch_380_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_380_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_381_logo.png b/tests/common/res/drawable-xhdpi/ch_381_logo.png
index 7059114c..7059114c 100644
--- a/tests/input/res/drawable-xhdpi/ch_381_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_381_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_382_logo.png b/tests/common/res/drawable-xhdpi/ch_382_logo.png
index a61201a5..a61201a5 100644
--- a/tests/input/res/drawable-xhdpi/ch_382_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_382_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_383_logo.png b/tests/common/res/drawable-xhdpi/ch_383_logo.png
index c126d6e3..c126d6e3 100644
--- a/tests/input/res/drawable-xhdpi/ch_383_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_383_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_384_logo.png b/tests/common/res/drawable-xhdpi/ch_384_logo.png
index 0bd5f454..0bd5f454 100644
--- a/tests/input/res/drawable-xhdpi/ch_384_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_384_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_385_logo.png b/tests/common/res/drawable-xhdpi/ch_385_logo.png
index 864ff5c6..864ff5c6 100644
--- a/tests/input/res/drawable-xhdpi/ch_385_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_385_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_386_logo.png b/tests/common/res/drawable-xhdpi/ch_386_logo.png
index 643db67a..643db67a 100644
--- a/tests/input/res/drawable-xhdpi/ch_386_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_386_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_387_logo.png b/tests/common/res/drawable-xhdpi/ch_387_logo.png
index 206ec14f..206ec14f 100644
--- a/tests/input/res/drawable-xhdpi/ch_387_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_387_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_388_logo.png b/tests/common/res/drawable-xhdpi/ch_388_logo.png
index 37c9dbae..37c9dbae 100644
--- a/tests/input/res/drawable-xhdpi/ch_388_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_388_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_389_logo.png b/tests/common/res/drawable-xhdpi/ch_389_logo.png
index 958ffb63..958ffb63 100644
--- a/tests/input/res/drawable-xhdpi/ch_389_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_389_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_38_logo.png b/tests/common/res/drawable-xhdpi/ch_38_logo.png
index 6e864bf8..6e864bf8 100644
--- a/tests/input/res/drawable-xhdpi/ch_38_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_38_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_390_logo.png b/tests/common/res/drawable-xhdpi/ch_390_logo.png
index a5a6547e..a5a6547e 100644
--- a/tests/input/res/drawable-xhdpi/ch_390_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_390_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_391_logo.png b/tests/common/res/drawable-xhdpi/ch_391_logo.png
index 0d1c076b..0d1c076b 100644
--- a/tests/input/res/drawable-xhdpi/ch_391_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_391_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_392_logo.png b/tests/common/res/drawable-xhdpi/ch_392_logo.png
index 25e3a87a..25e3a87a 100644
--- a/tests/input/res/drawable-xhdpi/ch_392_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_392_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_393_logo.png b/tests/common/res/drawable-xhdpi/ch_393_logo.png
index 92ebefe2..92ebefe2 100644
--- a/tests/input/res/drawable-xhdpi/ch_393_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_393_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_394_logo.png b/tests/common/res/drawable-xhdpi/ch_394_logo.png
index b220319a..b220319a 100644
--- a/tests/input/res/drawable-xhdpi/ch_394_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_394_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_395_logo.png b/tests/common/res/drawable-xhdpi/ch_395_logo.png
index 29df3f8f..29df3f8f 100644
--- a/tests/input/res/drawable-xhdpi/ch_395_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_395_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_396_logo.png b/tests/common/res/drawable-xhdpi/ch_396_logo.png
index f1e6f983..f1e6f983 100644
--- a/tests/input/res/drawable-xhdpi/ch_396_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_396_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_397_logo.png b/tests/common/res/drawable-xhdpi/ch_397_logo.png
index 7f44d63c..7f44d63c 100644
--- a/tests/input/res/drawable-xhdpi/ch_397_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_397_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_398_logo.png b/tests/common/res/drawable-xhdpi/ch_398_logo.png
index 03b14271..03b14271 100644
--- a/tests/input/res/drawable-xhdpi/ch_398_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_398_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_399_logo.png b/tests/common/res/drawable-xhdpi/ch_399_logo.png
index a15aaa4e..a15aaa4e 100644
--- a/tests/input/res/drawable-xhdpi/ch_399_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_399_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_39_logo.png b/tests/common/res/drawable-xhdpi/ch_39_logo.png
index 633a1172..633a1172 100644
--- a/tests/input/res/drawable-xhdpi/ch_39_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_39_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_3_logo.png b/tests/common/res/drawable-xhdpi/ch_3_logo.png
index 9c921385..9c921385 100644
--- a/tests/input/res/drawable-xhdpi/ch_3_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_3_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_400_logo.png b/tests/common/res/drawable-xhdpi/ch_400_logo.png
index 15442662..15442662 100644
--- a/tests/input/res/drawable-xhdpi/ch_400_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_400_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_401_logo.png b/tests/common/res/drawable-xhdpi/ch_401_logo.png
index c4d06916..c4d06916 100644
--- a/tests/input/res/drawable-xhdpi/ch_401_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_401_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_402_logo.png b/tests/common/res/drawable-xhdpi/ch_402_logo.png
index b8719f32..b8719f32 100644
--- a/tests/input/res/drawable-xhdpi/ch_402_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_402_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_403_logo.png b/tests/common/res/drawable-xhdpi/ch_403_logo.png
index 054b98b7..054b98b7 100644
--- a/tests/input/res/drawable-xhdpi/ch_403_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_403_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_404_logo.png b/tests/common/res/drawable-xhdpi/ch_404_logo.png
index 64566990..64566990 100644
--- a/tests/input/res/drawable-xhdpi/ch_404_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_404_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_405_logo.png b/tests/common/res/drawable-xhdpi/ch_405_logo.png
index 2ceab3fb..2ceab3fb 100644
--- a/tests/input/res/drawable-xhdpi/ch_405_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_405_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_406_logo.png b/tests/common/res/drawable-xhdpi/ch_406_logo.png
index f7557109..f7557109 100644
--- a/tests/input/res/drawable-xhdpi/ch_406_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_406_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_407_logo.png b/tests/common/res/drawable-xhdpi/ch_407_logo.png
index 8228e1c5..8228e1c5 100644
--- a/tests/input/res/drawable-xhdpi/ch_407_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_407_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_408_logo.png b/tests/common/res/drawable-xhdpi/ch_408_logo.png
index d9c09b85..d9c09b85 100644
--- a/tests/input/res/drawable-xhdpi/ch_408_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_408_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_409_logo.png b/tests/common/res/drawable-xhdpi/ch_409_logo.png
index fd2b76e5..fd2b76e5 100644
--- a/tests/input/res/drawable-xhdpi/ch_409_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_409_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_40_logo.png b/tests/common/res/drawable-xhdpi/ch_40_logo.png
index 63600168..63600168 100644
--- a/tests/input/res/drawable-xhdpi/ch_40_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_40_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_410_logo.png b/tests/common/res/drawable-xhdpi/ch_410_logo.png
index 8b05de2e..8b05de2e 100644
--- a/tests/input/res/drawable-xhdpi/ch_410_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_410_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_411_logo.png b/tests/common/res/drawable-xhdpi/ch_411_logo.png
index 7306991e..7306991e 100644
--- a/tests/input/res/drawable-xhdpi/ch_411_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_411_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_412_logo.png b/tests/common/res/drawable-xhdpi/ch_412_logo.png
index 55964214..55964214 100644
--- a/tests/input/res/drawable-xhdpi/ch_412_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_412_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_413_logo.png b/tests/common/res/drawable-xhdpi/ch_413_logo.png
index c744901d..c744901d 100644
--- a/tests/input/res/drawable-xhdpi/ch_413_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_413_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_414_logo.png b/tests/common/res/drawable-xhdpi/ch_414_logo.png
index 304dc7da..304dc7da 100644
--- a/tests/input/res/drawable-xhdpi/ch_414_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_414_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_415_logo.png b/tests/common/res/drawable-xhdpi/ch_415_logo.png
index 1a9b1f19..1a9b1f19 100644
--- a/tests/input/res/drawable-xhdpi/ch_415_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_415_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_416_logo.png b/tests/common/res/drawable-xhdpi/ch_416_logo.png
index 53318edf..53318edf 100644
--- a/tests/input/res/drawable-xhdpi/ch_416_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_416_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_417_logo.png b/tests/common/res/drawable-xhdpi/ch_417_logo.png
index 763bad1b..763bad1b 100644
--- a/tests/input/res/drawable-xhdpi/ch_417_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_417_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_418_logo.png b/tests/common/res/drawable-xhdpi/ch_418_logo.png
index afa06409..afa06409 100644
--- a/tests/input/res/drawable-xhdpi/ch_418_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_418_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_419_logo.png b/tests/common/res/drawable-xhdpi/ch_419_logo.png
index 4741b659..4741b659 100644
--- a/tests/input/res/drawable-xhdpi/ch_419_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_419_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_41_logo.png b/tests/common/res/drawable-xhdpi/ch_41_logo.png
index 6002ae31..6002ae31 100644
--- a/tests/input/res/drawable-xhdpi/ch_41_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_41_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_420_logo.png b/tests/common/res/drawable-xhdpi/ch_420_logo.png
index 22a72aec..22a72aec 100644
--- a/tests/input/res/drawable-xhdpi/ch_420_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_420_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_421_logo.png b/tests/common/res/drawable-xhdpi/ch_421_logo.png
index f4c301dd..f4c301dd 100644
--- a/tests/input/res/drawable-xhdpi/ch_421_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_421_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_422_logo.png b/tests/common/res/drawable-xhdpi/ch_422_logo.png
index e70d59ac..e70d59ac 100644
--- a/tests/input/res/drawable-xhdpi/ch_422_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_422_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_423_logo.png b/tests/common/res/drawable-xhdpi/ch_423_logo.png
index a4c96fbd..a4c96fbd 100644
--- a/tests/input/res/drawable-xhdpi/ch_423_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_423_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_424_logo.png b/tests/common/res/drawable-xhdpi/ch_424_logo.png
index 9dc1713e..9dc1713e 100644
--- a/tests/input/res/drawable-xhdpi/ch_424_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_424_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_425_logo.png b/tests/common/res/drawable-xhdpi/ch_425_logo.png
index a79e8f5c..a79e8f5c 100644
--- a/tests/input/res/drawable-xhdpi/ch_425_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_425_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_426_logo.png b/tests/common/res/drawable-xhdpi/ch_426_logo.png
index 34bcbef0..34bcbef0 100644
--- a/tests/input/res/drawable-xhdpi/ch_426_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_426_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_427_logo.png b/tests/common/res/drawable-xhdpi/ch_427_logo.png
index 6133494d..6133494d 100644
--- a/tests/input/res/drawable-xhdpi/ch_427_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_427_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_428_logo.png b/tests/common/res/drawable-xhdpi/ch_428_logo.png
index d91391a4..d91391a4 100644
--- a/tests/input/res/drawable-xhdpi/ch_428_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_428_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_429_logo.png b/tests/common/res/drawable-xhdpi/ch_429_logo.png
index f24a64f9..f24a64f9 100644
--- a/tests/input/res/drawable-xhdpi/ch_429_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_429_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_42_logo.png b/tests/common/res/drawable-xhdpi/ch_42_logo.png
index c2f641c0..c2f641c0 100644
--- a/tests/input/res/drawable-xhdpi/ch_42_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_42_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_430_logo.png b/tests/common/res/drawable-xhdpi/ch_430_logo.png
index e656d6da..e656d6da 100644
--- a/tests/input/res/drawable-xhdpi/ch_430_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_430_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_431_logo.png b/tests/common/res/drawable-xhdpi/ch_431_logo.png
index 4827d71d..4827d71d 100644
--- a/tests/input/res/drawable-xhdpi/ch_431_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_431_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_432_logo.png b/tests/common/res/drawable-xhdpi/ch_432_logo.png
index bb5493e2..bb5493e2 100644
--- a/tests/input/res/drawable-xhdpi/ch_432_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_432_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_433_logo.png b/tests/common/res/drawable-xhdpi/ch_433_logo.png
index f777f36a..f777f36a 100644
--- a/tests/input/res/drawable-xhdpi/ch_433_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_433_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_434_logo.png b/tests/common/res/drawable-xhdpi/ch_434_logo.png
index f342df85..f342df85 100644
--- a/tests/input/res/drawable-xhdpi/ch_434_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_434_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_435_logo.png b/tests/common/res/drawable-xhdpi/ch_435_logo.png
index 70667e7a..70667e7a 100644
--- a/tests/input/res/drawable-xhdpi/ch_435_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_435_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_436_logo.png b/tests/common/res/drawable-xhdpi/ch_436_logo.png
index 1895a238..1895a238 100644
--- a/tests/input/res/drawable-xhdpi/ch_436_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_436_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_437_logo.png b/tests/common/res/drawable-xhdpi/ch_437_logo.png
index 9b6b335b..9b6b335b 100644
--- a/tests/input/res/drawable-xhdpi/ch_437_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_437_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_438_logo.png b/tests/common/res/drawable-xhdpi/ch_438_logo.png
index 5070cdb1..5070cdb1 100644
--- a/tests/input/res/drawable-xhdpi/ch_438_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_438_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_439_logo.png b/tests/common/res/drawable-xhdpi/ch_439_logo.png
index adcad27b..adcad27b 100644
--- a/tests/input/res/drawable-xhdpi/ch_439_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_439_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_43_logo.png b/tests/common/res/drawable-xhdpi/ch_43_logo.png
index 5ea7d814..5ea7d814 100644
--- a/tests/input/res/drawable-xhdpi/ch_43_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_43_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_440_logo.png b/tests/common/res/drawable-xhdpi/ch_440_logo.png
index 0b1f76c6..0b1f76c6 100644
--- a/tests/input/res/drawable-xhdpi/ch_440_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_440_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_441_logo.png b/tests/common/res/drawable-xhdpi/ch_441_logo.png
index 65870b6e..65870b6e 100644
--- a/tests/input/res/drawable-xhdpi/ch_441_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_441_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_442_logo.png b/tests/common/res/drawable-xhdpi/ch_442_logo.png
index 9812a1cb..9812a1cb 100644
--- a/tests/input/res/drawable-xhdpi/ch_442_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_442_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_443_logo.png b/tests/common/res/drawable-xhdpi/ch_443_logo.png
index d539f5c1..d539f5c1 100644
--- a/tests/input/res/drawable-xhdpi/ch_443_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_443_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_444_logo.png b/tests/common/res/drawable-xhdpi/ch_444_logo.png
index fbf615d9..fbf615d9 100644
--- a/tests/input/res/drawable-xhdpi/ch_444_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_444_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_445_logo.png b/tests/common/res/drawable-xhdpi/ch_445_logo.png
index 440085aa..440085aa 100644
--- a/tests/input/res/drawable-xhdpi/ch_445_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_445_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_446_logo.png b/tests/common/res/drawable-xhdpi/ch_446_logo.png
index d26f1c37..d26f1c37 100644
--- a/tests/input/res/drawable-xhdpi/ch_446_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_446_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_447_logo.png b/tests/common/res/drawable-xhdpi/ch_447_logo.png
index 0967878d..0967878d 100644
--- a/tests/input/res/drawable-xhdpi/ch_447_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_447_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_448_logo.png b/tests/common/res/drawable-xhdpi/ch_448_logo.png
index b979c062..b979c062 100644
--- a/tests/input/res/drawable-xhdpi/ch_448_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_448_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_449_logo.png b/tests/common/res/drawable-xhdpi/ch_449_logo.png
index 2232b90e..2232b90e 100644
--- a/tests/input/res/drawable-xhdpi/ch_449_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_449_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_44_logo.png b/tests/common/res/drawable-xhdpi/ch_44_logo.png
index be6cbd3b..be6cbd3b 100644
--- a/tests/input/res/drawable-xhdpi/ch_44_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_44_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_450_logo.png b/tests/common/res/drawable-xhdpi/ch_450_logo.png
index 8e25df9a..8e25df9a 100644
--- a/tests/input/res/drawable-xhdpi/ch_450_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_450_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_451_logo.png b/tests/common/res/drawable-xhdpi/ch_451_logo.png
index c744e56e..c744e56e 100644
--- a/tests/input/res/drawable-xhdpi/ch_451_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_451_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_452_logo.png b/tests/common/res/drawable-xhdpi/ch_452_logo.png
index 050b0196..050b0196 100644
--- a/tests/input/res/drawable-xhdpi/ch_452_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_452_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_453_logo.png b/tests/common/res/drawable-xhdpi/ch_453_logo.png
index 4ccdbf14..4ccdbf14 100644
--- a/tests/input/res/drawable-xhdpi/ch_453_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_453_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_454_logo.png b/tests/common/res/drawable-xhdpi/ch_454_logo.png
index 10aa3779..10aa3779 100644
--- a/tests/input/res/drawable-xhdpi/ch_454_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_454_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_455_logo.png b/tests/common/res/drawable-xhdpi/ch_455_logo.png
index 7b607a6c..7b607a6c 100644
--- a/tests/input/res/drawable-xhdpi/ch_455_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_455_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_456_logo.png b/tests/common/res/drawable-xhdpi/ch_456_logo.png
index f2d57066..f2d57066 100644
--- a/tests/input/res/drawable-xhdpi/ch_456_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_456_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_457_logo.png b/tests/common/res/drawable-xhdpi/ch_457_logo.png
index 483e5912..483e5912 100644
--- a/tests/input/res/drawable-xhdpi/ch_457_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_457_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_458_logo.png b/tests/common/res/drawable-xhdpi/ch_458_logo.png
index 447d5942..447d5942 100644
--- a/tests/input/res/drawable-xhdpi/ch_458_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_458_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_459_logo.png b/tests/common/res/drawable-xhdpi/ch_459_logo.png
index 80d6c5b6..80d6c5b6 100644
--- a/tests/input/res/drawable-xhdpi/ch_459_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_459_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_45_logo.png b/tests/common/res/drawable-xhdpi/ch_45_logo.png
index 0db467c8..0db467c8 100644
--- a/tests/input/res/drawable-xhdpi/ch_45_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_45_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_460_logo.png b/tests/common/res/drawable-xhdpi/ch_460_logo.png
index 22d785cb..22d785cb 100644
--- a/tests/input/res/drawable-xhdpi/ch_460_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_460_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_461_logo.png b/tests/common/res/drawable-xhdpi/ch_461_logo.png
index 658a1046..658a1046 100644
--- a/tests/input/res/drawable-xhdpi/ch_461_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_461_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_462_logo.png b/tests/common/res/drawable-xhdpi/ch_462_logo.png
index dd0c5d14..dd0c5d14 100644
--- a/tests/input/res/drawable-xhdpi/ch_462_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_462_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_463_logo.png b/tests/common/res/drawable-xhdpi/ch_463_logo.png
index 7b72b915..7b72b915 100644
--- a/tests/input/res/drawable-xhdpi/ch_463_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_463_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_464_logo.png b/tests/common/res/drawable-xhdpi/ch_464_logo.png
index cc15444c..cc15444c 100644
--- a/tests/input/res/drawable-xhdpi/ch_464_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_464_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_465_logo.png b/tests/common/res/drawable-xhdpi/ch_465_logo.png
index a17cb719..a17cb719 100644
--- a/tests/input/res/drawable-xhdpi/ch_465_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_465_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_466_logo.png b/tests/common/res/drawable-xhdpi/ch_466_logo.png
index 604644f4..604644f4 100644
--- a/tests/input/res/drawable-xhdpi/ch_466_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_466_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_467_logo.png b/tests/common/res/drawable-xhdpi/ch_467_logo.png
index 4c74b50d..4c74b50d 100644
--- a/tests/input/res/drawable-xhdpi/ch_467_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_467_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_468_logo.png b/tests/common/res/drawable-xhdpi/ch_468_logo.png
index 8e329206..8e329206 100644
--- a/tests/input/res/drawable-xhdpi/ch_468_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_468_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_469_logo.png b/tests/common/res/drawable-xhdpi/ch_469_logo.png
index 14a1d99e..14a1d99e 100644
--- a/tests/input/res/drawable-xhdpi/ch_469_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_469_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_46_logo.png b/tests/common/res/drawable-xhdpi/ch_46_logo.png
index f9d83ea9..f9d83ea9 100644
--- a/tests/input/res/drawable-xhdpi/ch_46_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_46_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_470_logo.png b/tests/common/res/drawable-xhdpi/ch_470_logo.png
index 567e879a..567e879a 100644
--- a/tests/input/res/drawable-xhdpi/ch_470_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_470_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_471_logo.png b/tests/common/res/drawable-xhdpi/ch_471_logo.png
index 4a128a0e..4a128a0e 100644
--- a/tests/input/res/drawable-xhdpi/ch_471_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_471_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_472_logo.png b/tests/common/res/drawable-xhdpi/ch_472_logo.png
index f00d1cb0..f00d1cb0 100644
--- a/tests/input/res/drawable-xhdpi/ch_472_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_472_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_473_logo.png b/tests/common/res/drawable-xhdpi/ch_473_logo.png
index ee7bbfc9..ee7bbfc9 100644
--- a/tests/input/res/drawable-xhdpi/ch_473_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_473_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_474_logo.png b/tests/common/res/drawable-xhdpi/ch_474_logo.png
index a1b7e0eb..a1b7e0eb 100644
--- a/tests/input/res/drawable-xhdpi/ch_474_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_474_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_475_logo.png b/tests/common/res/drawable-xhdpi/ch_475_logo.png
index 14db7abe..14db7abe 100644
--- a/tests/input/res/drawable-xhdpi/ch_475_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_475_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_476_logo.png b/tests/common/res/drawable-xhdpi/ch_476_logo.png
index 89c71e80..89c71e80 100644
--- a/tests/input/res/drawable-xhdpi/ch_476_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_476_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_477_logo.png b/tests/common/res/drawable-xhdpi/ch_477_logo.png
index 60509130..60509130 100644
--- a/tests/input/res/drawable-xhdpi/ch_477_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_477_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_478_logo.png b/tests/common/res/drawable-xhdpi/ch_478_logo.png
index a2c3069b..a2c3069b 100644
--- a/tests/input/res/drawable-xhdpi/ch_478_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_478_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_479_logo.png b/tests/common/res/drawable-xhdpi/ch_479_logo.png
index 2be6ae4f..2be6ae4f 100644
--- a/tests/input/res/drawable-xhdpi/ch_479_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_479_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_47_logo.png b/tests/common/res/drawable-xhdpi/ch_47_logo.png
index ed4b464a..ed4b464a 100644
--- a/tests/input/res/drawable-xhdpi/ch_47_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_47_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_480_logo.png b/tests/common/res/drawable-xhdpi/ch_480_logo.png
index f2a2d6fa..f2a2d6fa 100644
--- a/tests/input/res/drawable-xhdpi/ch_480_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_480_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_481_logo.png b/tests/common/res/drawable-xhdpi/ch_481_logo.png
index b71fcfa8..b71fcfa8 100644
--- a/tests/input/res/drawable-xhdpi/ch_481_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_481_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_482_logo.png b/tests/common/res/drawable-xhdpi/ch_482_logo.png
index 8d317e47..8d317e47 100644
--- a/tests/input/res/drawable-xhdpi/ch_482_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_482_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_483_logo.png b/tests/common/res/drawable-xhdpi/ch_483_logo.png
index ea417f9e..ea417f9e 100644
--- a/tests/input/res/drawable-xhdpi/ch_483_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_483_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_484_logo.png b/tests/common/res/drawable-xhdpi/ch_484_logo.png
index b46584a4..b46584a4 100644
--- a/tests/input/res/drawable-xhdpi/ch_484_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_484_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_485_logo.png b/tests/common/res/drawable-xhdpi/ch_485_logo.png
index 3564dcd5..3564dcd5 100644
--- a/tests/input/res/drawable-xhdpi/ch_485_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_485_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_486_logo.png b/tests/common/res/drawable-xhdpi/ch_486_logo.png
index 8227575f..8227575f 100644
--- a/tests/input/res/drawable-xhdpi/ch_486_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_486_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_487_logo.png b/tests/common/res/drawable-xhdpi/ch_487_logo.png
index edb15bee..edb15bee 100644
--- a/tests/input/res/drawable-xhdpi/ch_487_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_487_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_488_logo.png b/tests/common/res/drawable-xhdpi/ch_488_logo.png
index f358d335..f358d335 100644
--- a/tests/input/res/drawable-xhdpi/ch_488_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_488_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_489_logo.png b/tests/common/res/drawable-xhdpi/ch_489_logo.png
index 5122c67e..5122c67e 100644
--- a/tests/input/res/drawable-xhdpi/ch_489_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_489_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_48_logo.png b/tests/common/res/drawable-xhdpi/ch_48_logo.png
index e1be7313..e1be7313 100644
--- a/tests/input/res/drawable-xhdpi/ch_48_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_48_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_490_logo.png b/tests/common/res/drawable-xhdpi/ch_490_logo.png
index 1901d995..1901d995 100644
--- a/tests/input/res/drawable-xhdpi/ch_490_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_490_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_491_logo.png b/tests/common/res/drawable-xhdpi/ch_491_logo.png
index 04b0a021..04b0a021 100644
--- a/tests/input/res/drawable-xhdpi/ch_491_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_491_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_492_logo.png b/tests/common/res/drawable-xhdpi/ch_492_logo.png
index b18dea9b..b18dea9b 100644
--- a/tests/input/res/drawable-xhdpi/ch_492_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_492_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_493_logo.png b/tests/common/res/drawable-xhdpi/ch_493_logo.png
index 19044655..19044655 100644
--- a/tests/input/res/drawable-xhdpi/ch_493_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_493_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_494_logo.png b/tests/common/res/drawable-xhdpi/ch_494_logo.png
index b5b0f76c..b5b0f76c 100644
--- a/tests/input/res/drawable-xhdpi/ch_494_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_494_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_495_logo.png b/tests/common/res/drawable-xhdpi/ch_495_logo.png
index 6124dc83..6124dc83 100644
--- a/tests/input/res/drawable-xhdpi/ch_495_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_495_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_496_logo.png b/tests/common/res/drawable-xhdpi/ch_496_logo.png
index 6b0e472b..6b0e472b 100644
--- a/tests/input/res/drawable-xhdpi/ch_496_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_496_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_497_logo.png b/tests/common/res/drawable-xhdpi/ch_497_logo.png
index 31fcd048..31fcd048 100644
--- a/tests/input/res/drawable-xhdpi/ch_497_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_497_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_498_logo.png b/tests/common/res/drawable-xhdpi/ch_498_logo.png
index 472c09b6..472c09b6 100644
--- a/tests/input/res/drawable-xhdpi/ch_498_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_498_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_499_logo.png b/tests/common/res/drawable-xhdpi/ch_499_logo.png
index 2d653f61..2d653f61 100644
--- a/tests/input/res/drawable-xhdpi/ch_499_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_499_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_49_logo.png b/tests/common/res/drawable-xhdpi/ch_49_logo.png
index 46bc774d..46bc774d 100644
--- a/tests/input/res/drawable-xhdpi/ch_49_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_49_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_4_logo.png b/tests/common/res/drawable-xhdpi/ch_4_logo.png
index d5e6517c..d5e6517c 100644
--- a/tests/input/res/drawable-xhdpi/ch_4_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_4_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_500_logo.png b/tests/common/res/drawable-xhdpi/ch_500_logo.png
index ecfa17ec..ecfa17ec 100644
--- a/tests/input/res/drawable-xhdpi/ch_500_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_500_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_501_logo.png b/tests/common/res/drawable-xhdpi/ch_501_logo.png
index 0c81a787..0c81a787 100644
--- a/tests/input/res/drawable-xhdpi/ch_501_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_501_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_502_logo.png b/tests/common/res/drawable-xhdpi/ch_502_logo.png
index 5dd20644..5dd20644 100644
--- a/tests/input/res/drawable-xhdpi/ch_502_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_502_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_503_logo.png b/tests/common/res/drawable-xhdpi/ch_503_logo.png
index a48ec52d..a48ec52d 100644
--- a/tests/input/res/drawable-xhdpi/ch_503_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_503_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_504_logo.png b/tests/common/res/drawable-xhdpi/ch_504_logo.png
index 999a641e..999a641e 100644
--- a/tests/input/res/drawable-xhdpi/ch_504_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_504_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_505_logo.png b/tests/common/res/drawable-xhdpi/ch_505_logo.png
index d7c600e4..d7c600e4 100644
--- a/tests/input/res/drawable-xhdpi/ch_505_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_505_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_506_logo.png b/tests/common/res/drawable-xhdpi/ch_506_logo.png
index ac80e6dd..ac80e6dd 100644
--- a/tests/input/res/drawable-xhdpi/ch_506_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_506_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_507_logo.png b/tests/common/res/drawable-xhdpi/ch_507_logo.png
index c4d434f8..c4d434f8 100644
--- a/tests/input/res/drawable-xhdpi/ch_507_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_507_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_508_logo.png b/tests/common/res/drawable-xhdpi/ch_508_logo.png
index 35330059..35330059 100644
--- a/tests/input/res/drawable-xhdpi/ch_508_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_508_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_509_logo.png b/tests/common/res/drawable-xhdpi/ch_509_logo.png
index 2077eac5..2077eac5 100644
--- a/tests/input/res/drawable-xhdpi/ch_509_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_509_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_50_logo.png b/tests/common/res/drawable-xhdpi/ch_50_logo.png
index 901373e6..901373e6 100644
--- a/tests/input/res/drawable-xhdpi/ch_50_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_50_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_510_logo.png b/tests/common/res/drawable-xhdpi/ch_510_logo.png
index 469bf77d..469bf77d 100644
--- a/tests/input/res/drawable-xhdpi/ch_510_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_510_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_511_logo.png b/tests/common/res/drawable-xhdpi/ch_511_logo.png
index 80d727bb..80d727bb 100644
--- a/tests/input/res/drawable-xhdpi/ch_511_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_511_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_512_logo.png b/tests/common/res/drawable-xhdpi/ch_512_logo.png
index 37ba7e2b..37ba7e2b 100644
--- a/tests/input/res/drawable-xhdpi/ch_512_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_512_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_513_logo.png b/tests/common/res/drawable-xhdpi/ch_513_logo.png
index ef7c4f2a..ef7c4f2a 100644
--- a/tests/input/res/drawable-xhdpi/ch_513_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_513_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_514_logo.png b/tests/common/res/drawable-xhdpi/ch_514_logo.png
index 450f5963..450f5963 100644
--- a/tests/input/res/drawable-xhdpi/ch_514_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_514_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_515_logo.png b/tests/common/res/drawable-xhdpi/ch_515_logo.png
index 6533b2fd..6533b2fd 100644
--- a/tests/input/res/drawable-xhdpi/ch_515_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_515_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_516_logo.png b/tests/common/res/drawable-xhdpi/ch_516_logo.png
index 08cd2f0d..08cd2f0d 100644
--- a/tests/input/res/drawable-xhdpi/ch_516_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_516_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_517_logo.png b/tests/common/res/drawable-xhdpi/ch_517_logo.png
index 1935d709..1935d709 100644
--- a/tests/input/res/drawable-xhdpi/ch_517_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_517_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_518_logo.png b/tests/common/res/drawable-xhdpi/ch_518_logo.png
index 806fbbbf..806fbbbf 100644
--- a/tests/input/res/drawable-xhdpi/ch_518_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_518_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_519_logo.png b/tests/common/res/drawable-xhdpi/ch_519_logo.png
index 938bb559..938bb559 100644
--- a/tests/input/res/drawable-xhdpi/ch_519_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_519_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_51_logo.png b/tests/common/res/drawable-xhdpi/ch_51_logo.png
index 07a5f4ad..07a5f4ad 100644
--- a/tests/input/res/drawable-xhdpi/ch_51_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_51_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_520_logo.png b/tests/common/res/drawable-xhdpi/ch_520_logo.png
index 7f9f68b2..7f9f68b2 100644
--- a/tests/input/res/drawable-xhdpi/ch_520_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_520_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_521_logo.png b/tests/common/res/drawable-xhdpi/ch_521_logo.png
index e8d0432c..e8d0432c 100644
--- a/tests/input/res/drawable-xhdpi/ch_521_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_521_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_522_logo.png b/tests/common/res/drawable-xhdpi/ch_522_logo.png
index d7345b8c..d7345b8c 100644
--- a/tests/input/res/drawable-xhdpi/ch_522_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_522_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_523_logo.png b/tests/common/res/drawable-xhdpi/ch_523_logo.png
index 61573120..61573120 100644
--- a/tests/input/res/drawable-xhdpi/ch_523_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_523_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_524_logo.png b/tests/common/res/drawable-xhdpi/ch_524_logo.png
index 9a8b2fdd..9a8b2fdd 100644
--- a/tests/input/res/drawable-xhdpi/ch_524_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_524_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_525_logo.png b/tests/common/res/drawable-xhdpi/ch_525_logo.png
index 9ed318fa..9ed318fa 100644
--- a/tests/input/res/drawable-xhdpi/ch_525_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_525_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_526_logo.png b/tests/common/res/drawable-xhdpi/ch_526_logo.png
index 5000af2a..5000af2a 100644
--- a/tests/input/res/drawable-xhdpi/ch_526_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_526_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_527_logo.png b/tests/common/res/drawable-xhdpi/ch_527_logo.png
index 38fbd9eb..38fbd9eb 100644
--- a/tests/input/res/drawable-xhdpi/ch_527_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_527_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_528_logo.png b/tests/common/res/drawable-xhdpi/ch_528_logo.png
index 565e8b2a..565e8b2a 100644
--- a/tests/input/res/drawable-xhdpi/ch_528_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_528_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_529_logo.png b/tests/common/res/drawable-xhdpi/ch_529_logo.png
index b0924df7..b0924df7 100644
--- a/tests/input/res/drawable-xhdpi/ch_529_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_529_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_52_logo.png b/tests/common/res/drawable-xhdpi/ch_52_logo.png
index 6faa9702..6faa9702 100644
--- a/tests/input/res/drawable-xhdpi/ch_52_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_52_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_530_logo.png b/tests/common/res/drawable-xhdpi/ch_530_logo.png
index 0eec0234..0eec0234 100644
--- a/tests/input/res/drawable-xhdpi/ch_530_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_530_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_531_logo.png b/tests/common/res/drawable-xhdpi/ch_531_logo.png
index 2f0243d1..2f0243d1 100644
--- a/tests/input/res/drawable-xhdpi/ch_531_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_531_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_532_logo.png b/tests/common/res/drawable-xhdpi/ch_532_logo.png
index a6ece89e..a6ece89e 100644
--- a/tests/input/res/drawable-xhdpi/ch_532_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_532_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_533_logo.png b/tests/common/res/drawable-xhdpi/ch_533_logo.png
index a1695158..a1695158 100644
--- a/tests/input/res/drawable-xhdpi/ch_533_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_533_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_534_logo.png b/tests/common/res/drawable-xhdpi/ch_534_logo.png
index 00ad0b07..00ad0b07 100644
--- a/tests/input/res/drawable-xhdpi/ch_534_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_534_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_535_logo.png b/tests/common/res/drawable-xhdpi/ch_535_logo.png
index a536ff32..a536ff32 100644
--- a/tests/input/res/drawable-xhdpi/ch_535_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_535_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_536_logo.png b/tests/common/res/drawable-xhdpi/ch_536_logo.png
index 60fcdf33..60fcdf33 100644
--- a/tests/input/res/drawable-xhdpi/ch_536_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_536_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_537_logo.png b/tests/common/res/drawable-xhdpi/ch_537_logo.png
index 0446d9bc..0446d9bc 100644
--- a/tests/input/res/drawable-xhdpi/ch_537_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_537_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_538_logo.png b/tests/common/res/drawable-xhdpi/ch_538_logo.png
index 6f98e08d..6f98e08d 100644
--- a/tests/input/res/drawable-xhdpi/ch_538_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_538_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_539_logo.png b/tests/common/res/drawable-xhdpi/ch_539_logo.png
index b6f17bbb..b6f17bbb 100644
--- a/tests/input/res/drawable-xhdpi/ch_539_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_539_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_53_logo.png b/tests/common/res/drawable-xhdpi/ch_53_logo.png
index 441e1d97..441e1d97 100644
--- a/tests/input/res/drawable-xhdpi/ch_53_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_53_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_540_logo.png b/tests/common/res/drawable-xhdpi/ch_540_logo.png
index 61950bff..61950bff 100644
--- a/tests/input/res/drawable-xhdpi/ch_540_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_540_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_541_logo.png b/tests/common/res/drawable-xhdpi/ch_541_logo.png
index eea9a988..eea9a988 100644
--- a/tests/input/res/drawable-xhdpi/ch_541_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_541_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_542_logo.png b/tests/common/res/drawable-xhdpi/ch_542_logo.png
index 684cf6d1..684cf6d1 100644
--- a/tests/input/res/drawable-xhdpi/ch_542_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_542_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_543_logo.png b/tests/common/res/drawable-xhdpi/ch_543_logo.png
index 44e4e6e0..44e4e6e0 100644
--- a/tests/input/res/drawable-xhdpi/ch_543_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_543_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_544_logo.png b/tests/common/res/drawable-xhdpi/ch_544_logo.png
index adf6c97a..adf6c97a 100644
--- a/tests/input/res/drawable-xhdpi/ch_544_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_544_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_545_logo.png b/tests/common/res/drawable-xhdpi/ch_545_logo.png
index 57f8edc6..57f8edc6 100644
--- a/tests/input/res/drawable-xhdpi/ch_545_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_545_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_546_logo.png b/tests/common/res/drawable-xhdpi/ch_546_logo.png
index 4ac92311..4ac92311 100644
--- a/tests/input/res/drawable-xhdpi/ch_546_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_546_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_547_logo.png b/tests/common/res/drawable-xhdpi/ch_547_logo.png
index ca857974..ca857974 100644
--- a/tests/input/res/drawable-xhdpi/ch_547_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_547_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_548_logo.png b/tests/common/res/drawable-xhdpi/ch_548_logo.png
index 1037011c..1037011c 100644
--- a/tests/input/res/drawable-xhdpi/ch_548_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_548_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_549_logo.png b/tests/common/res/drawable-xhdpi/ch_549_logo.png
index fd10a2ee..fd10a2ee 100644
--- a/tests/input/res/drawable-xhdpi/ch_549_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_549_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_54_logo.png b/tests/common/res/drawable-xhdpi/ch_54_logo.png
index 50f22f48..50f22f48 100644
--- a/tests/input/res/drawable-xhdpi/ch_54_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_54_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_550_logo.png b/tests/common/res/drawable-xhdpi/ch_550_logo.png
index 992666b6..992666b6 100644
--- a/tests/input/res/drawable-xhdpi/ch_550_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_550_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_551_logo.png b/tests/common/res/drawable-xhdpi/ch_551_logo.png
index 41369f0b..41369f0b 100644
--- a/tests/input/res/drawable-xhdpi/ch_551_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_551_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_552_logo.png b/tests/common/res/drawable-xhdpi/ch_552_logo.png
index 56be3e73..56be3e73 100644
--- a/tests/input/res/drawable-xhdpi/ch_552_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_552_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_553_logo.png b/tests/common/res/drawable-xhdpi/ch_553_logo.png
index 04812119..04812119 100644
--- a/tests/input/res/drawable-xhdpi/ch_553_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_553_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_554_logo.png b/tests/common/res/drawable-xhdpi/ch_554_logo.png
index b7e943a3..b7e943a3 100644
--- a/tests/input/res/drawable-xhdpi/ch_554_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_554_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_555_logo.png b/tests/common/res/drawable-xhdpi/ch_555_logo.png
index fb74741b..fb74741b 100644
--- a/tests/input/res/drawable-xhdpi/ch_555_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_555_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_556_logo.png b/tests/common/res/drawable-xhdpi/ch_556_logo.png
index 8c6d4046..8c6d4046 100644
--- a/tests/input/res/drawable-xhdpi/ch_556_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_556_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_557_logo.png b/tests/common/res/drawable-xhdpi/ch_557_logo.png
index fe65c25c..fe65c25c 100644
--- a/tests/input/res/drawable-xhdpi/ch_557_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_557_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_558_logo.png b/tests/common/res/drawable-xhdpi/ch_558_logo.png
index 598e6424..598e6424 100644
--- a/tests/input/res/drawable-xhdpi/ch_558_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_558_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_559_logo.png b/tests/common/res/drawable-xhdpi/ch_559_logo.png
index 68a46085..68a46085 100644
--- a/tests/input/res/drawable-xhdpi/ch_559_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_559_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_55_logo.png b/tests/common/res/drawable-xhdpi/ch_55_logo.png
index 59f21e84..59f21e84 100644
--- a/tests/input/res/drawable-xhdpi/ch_55_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_55_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_560_logo.png b/tests/common/res/drawable-xhdpi/ch_560_logo.png
index db6d6693..db6d6693 100644
--- a/tests/input/res/drawable-xhdpi/ch_560_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_560_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_561_logo.png b/tests/common/res/drawable-xhdpi/ch_561_logo.png
index b53f08f0..b53f08f0 100644
--- a/tests/input/res/drawable-xhdpi/ch_561_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_561_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_562_logo.png b/tests/common/res/drawable-xhdpi/ch_562_logo.png
index 970f0174..970f0174 100644
--- a/tests/input/res/drawable-xhdpi/ch_562_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_562_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_563_logo.png b/tests/common/res/drawable-xhdpi/ch_563_logo.png
index 1c426378..1c426378 100644
--- a/tests/input/res/drawable-xhdpi/ch_563_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_563_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_564_logo.png b/tests/common/res/drawable-xhdpi/ch_564_logo.png
index 61a89f16..61a89f16 100644
--- a/tests/input/res/drawable-xhdpi/ch_564_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_564_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_565_logo.png b/tests/common/res/drawable-xhdpi/ch_565_logo.png
index 956342b2..956342b2 100644
--- a/tests/input/res/drawable-xhdpi/ch_565_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_565_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_566_logo.png b/tests/common/res/drawable-xhdpi/ch_566_logo.png
index a935ec4a..a935ec4a 100644
--- a/tests/input/res/drawable-xhdpi/ch_566_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_566_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_567_logo.png b/tests/common/res/drawable-xhdpi/ch_567_logo.png
index 4d6e407e..4d6e407e 100644
--- a/tests/input/res/drawable-xhdpi/ch_567_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_567_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_568_logo.png b/tests/common/res/drawable-xhdpi/ch_568_logo.png
index f4578ed0..f4578ed0 100644
--- a/tests/input/res/drawable-xhdpi/ch_568_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_568_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_569_logo.png b/tests/common/res/drawable-xhdpi/ch_569_logo.png
index 807c7323..807c7323 100644
--- a/tests/input/res/drawable-xhdpi/ch_569_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_569_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_56_logo.png b/tests/common/res/drawable-xhdpi/ch_56_logo.png
index dc296510..dc296510 100644
--- a/tests/input/res/drawable-xhdpi/ch_56_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_56_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_570_logo.png b/tests/common/res/drawable-xhdpi/ch_570_logo.png
index ef03c654..ef03c654 100644
--- a/tests/input/res/drawable-xhdpi/ch_570_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_570_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_571_logo.png b/tests/common/res/drawable-xhdpi/ch_571_logo.png
index 422f9aa4..422f9aa4 100644
--- a/tests/input/res/drawable-xhdpi/ch_571_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_571_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_572_logo.png b/tests/common/res/drawable-xhdpi/ch_572_logo.png
index 68d08376..68d08376 100644
--- a/tests/input/res/drawable-xhdpi/ch_572_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_572_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_573_logo.png b/tests/common/res/drawable-xhdpi/ch_573_logo.png
index 1d8ca402..1d8ca402 100644
--- a/tests/input/res/drawable-xhdpi/ch_573_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_573_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_574_logo.png b/tests/common/res/drawable-xhdpi/ch_574_logo.png
index f582224a..f582224a 100644
--- a/tests/input/res/drawable-xhdpi/ch_574_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_574_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_575_logo.png b/tests/common/res/drawable-xhdpi/ch_575_logo.png
index 44fc827b..44fc827b 100644
--- a/tests/input/res/drawable-xhdpi/ch_575_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_575_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_576_logo.png b/tests/common/res/drawable-xhdpi/ch_576_logo.png
index a8c9b36d..a8c9b36d 100644
--- a/tests/input/res/drawable-xhdpi/ch_576_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_576_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_577_logo.png b/tests/common/res/drawable-xhdpi/ch_577_logo.png
index 328c67a9..328c67a9 100644
--- a/tests/input/res/drawable-xhdpi/ch_577_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_577_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_578_logo.png b/tests/common/res/drawable-xhdpi/ch_578_logo.png
index d856dac5..d856dac5 100644
--- a/tests/input/res/drawable-xhdpi/ch_578_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_578_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_579_logo.png b/tests/common/res/drawable-xhdpi/ch_579_logo.png
index 2a989c37..2a989c37 100644
--- a/tests/input/res/drawable-xhdpi/ch_579_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_579_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_57_logo.png b/tests/common/res/drawable-xhdpi/ch_57_logo.png
index 72981424..72981424 100644
--- a/tests/input/res/drawable-xhdpi/ch_57_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_57_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_580_logo.png b/tests/common/res/drawable-xhdpi/ch_580_logo.png
index 4c8034c8..4c8034c8 100644
--- a/tests/input/res/drawable-xhdpi/ch_580_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_580_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_581_logo.png b/tests/common/res/drawable-xhdpi/ch_581_logo.png
index 7423ef65..7423ef65 100644
--- a/tests/input/res/drawable-xhdpi/ch_581_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_581_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_582_logo.png b/tests/common/res/drawable-xhdpi/ch_582_logo.png
index ffbc803d..ffbc803d 100644
--- a/tests/input/res/drawable-xhdpi/ch_582_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_582_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_583_logo.png b/tests/common/res/drawable-xhdpi/ch_583_logo.png
index d6b92dce..d6b92dce 100644
--- a/tests/input/res/drawable-xhdpi/ch_583_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_583_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_584_logo.png b/tests/common/res/drawable-xhdpi/ch_584_logo.png
index cecbe6c7..cecbe6c7 100644
--- a/tests/input/res/drawable-xhdpi/ch_584_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_584_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_585_logo.png b/tests/common/res/drawable-xhdpi/ch_585_logo.png
index 99b994f7..99b994f7 100644
--- a/tests/input/res/drawable-xhdpi/ch_585_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_585_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_586_logo.png b/tests/common/res/drawable-xhdpi/ch_586_logo.png
index a54afdd4..a54afdd4 100644
--- a/tests/input/res/drawable-xhdpi/ch_586_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_586_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_587_logo.png b/tests/common/res/drawable-xhdpi/ch_587_logo.png
index e09f40ff..e09f40ff 100644
--- a/tests/input/res/drawable-xhdpi/ch_587_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_587_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_588_logo.png b/tests/common/res/drawable-xhdpi/ch_588_logo.png
index e4b3c192..e4b3c192 100644
--- a/tests/input/res/drawable-xhdpi/ch_588_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_588_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_589_logo.png b/tests/common/res/drawable-xhdpi/ch_589_logo.png
index 2c451a54..2c451a54 100644
--- a/tests/input/res/drawable-xhdpi/ch_589_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_589_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_58_logo.png b/tests/common/res/drawable-xhdpi/ch_58_logo.png
index 07f71a01..07f71a01 100644
--- a/tests/input/res/drawable-xhdpi/ch_58_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_58_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_590_logo.png b/tests/common/res/drawable-xhdpi/ch_590_logo.png
index 56e5e60c..56e5e60c 100644
--- a/tests/input/res/drawable-xhdpi/ch_590_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_590_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_591_logo.png b/tests/common/res/drawable-xhdpi/ch_591_logo.png
index 09e1a554..09e1a554 100644
--- a/tests/input/res/drawable-xhdpi/ch_591_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_591_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_592_logo.png b/tests/common/res/drawable-xhdpi/ch_592_logo.png
index 82635ce4..82635ce4 100644
--- a/tests/input/res/drawable-xhdpi/ch_592_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_592_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_593_logo.png b/tests/common/res/drawable-xhdpi/ch_593_logo.png
index 21f8e54c..21f8e54c 100644
--- a/tests/input/res/drawable-xhdpi/ch_593_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_593_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_594_logo.png b/tests/common/res/drawable-xhdpi/ch_594_logo.png
index 8de16c08..8de16c08 100644
--- a/tests/input/res/drawable-xhdpi/ch_594_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_594_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_595_logo.png b/tests/common/res/drawable-xhdpi/ch_595_logo.png
index 7fd01896..7fd01896 100644
--- a/tests/input/res/drawable-xhdpi/ch_595_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_595_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_596_logo.png b/tests/common/res/drawable-xhdpi/ch_596_logo.png
index 35452d61..35452d61 100644
--- a/tests/input/res/drawable-xhdpi/ch_596_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_596_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_597_logo.png b/tests/common/res/drawable-xhdpi/ch_597_logo.png
index c812338a..c812338a 100644
--- a/tests/input/res/drawable-xhdpi/ch_597_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_597_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_598_logo.png b/tests/common/res/drawable-xhdpi/ch_598_logo.png
index 6a7a4da0..6a7a4da0 100644
--- a/tests/input/res/drawable-xhdpi/ch_598_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_598_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_599_logo.png b/tests/common/res/drawable-xhdpi/ch_599_logo.png
index 9bb000ac..9bb000ac 100644
--- a/tests/input/res/drawable-xhdpi/ch_599_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_599_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_59_logo.png b/tests/common/res/drawable-xhdpi/ch_59_logo.png
index a7a0155f..a7a0155f 100644
--- a/tests/input/res/drawable-xhdpi/ch_59_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_59_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_5_logo.png b/tests/common/res/drawable-xhdpi/ch_5_logo.png
index 2de0c9cc..2de0c9cc 100644
--- a/tests/input/res/drawable-xhdpi/ch_5_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_5_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_600_logo.png b/tests/common/res/drawable-xhdpi/ch_600_logo.png
index e3b247e9..e3b247e9 100644
--- a/tests/input/res/drawable-xhdpi/ch_600_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_600_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_601_logo.png b/tests/common/res/drawable-xhdpi/ch_601_logo.png
index ff572b8c..ff572b8c 100644
--- a/tests/input/res/drawable-xhdpi/ch_601_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_601_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_602_logo.png b/tests/common/res/drawable-xhdpi/ch_602_logo.png
index 56d0505a..56d0505a 100644
--- a/tests/input/res/drawable-xhdpi/ch_602_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_602_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_603_logo.png b/tests/common/res/drawable-xhdpi/ch_603_logo.png
index e0d30043..e0d30043 100644
--- a/tests/input/res/drawable-xhdpi/ch_603_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_603_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_604_logo.png b/tests/common/res/drawable-xhdpi/ch_604_logo.png
index 4a592ff9..4a592ff9 100644
--- a/tests/input/res/drawable-xhdpi/ch_604_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_604_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_605_logo.png b/tests/common/res/drawable-xhdpi/ch_605_logo.png
index e415b276..e415b276 100644
--- a/tests/input/res/drawable-xhdpi/ch_605_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_605_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_606_logo.png b/tests/common/res/drawable-xhdpi/ch_606_logo.png
index 2c7b490b..2c7b490b 100644
--- a/tests/input/res/drawable-xhdpi/ch_606_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_606_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_607_logo.png b/tests/common/res/drawable-xhdpi/ch_607_logo.png
index 649d0327..649d0327 100644
--- a/tests/input/res/drawable-xhdpi/ch_607_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_607_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_608_logo.png b/tests/common/res/drawable-xhdpi/ch_608_logo.png
index 5581b4d9..5581b4d9 100644
--- a/tests/input/res/drawable-xhdpi/ch_608_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_608_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_609_logo.png b/tests/common/res/drawable-xhdpi/ch_609_logo.png
index da8f4bb3..da8f4bb3 100644
--- a/tests/input/res/drawable-xhdpi/ch_609_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_609_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_60_logo.png b/tests/common/res/drawable-xhdpi/ch_60_logo.png
index 0ee771f8..0ee771f8 100644
--- a/tests/input/res/drawable-xhdpi/ch_60_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_60_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_610_logo.png b/tests/common/res/drawable-xhdpi/ch_610_logo.png
index 7cdbcbd6..7cdbcbd6 100644
--- a/tests/input/res/drawable-xhdpi/ch_610_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_610_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_611_logo.png b/tests/common/res/drawable-xhdpi/ch_611_logo.png
index b14d3f54..b14d3f54 100644
--- a/tests/input/res/drawable-xhdpi/ch_611_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_611_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_612_logo.png b/tests/common/res/drawable-xhdpi/ch_612_logo.png
index d56de9ff..d56de9ff 100644
--- a/tests/input/res/drawable-xhdpi/ch_612_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_612_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_613_logo.png b/tests/common/res/drawable-xhdpi/ch_613_logo.png
index 7cfec8b5..7cfec8b5 100644
--- a/tests/input/res/drawable-xhdpi/ch_613_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_613_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_614_logo.png b/tests/common/res/drawable-xhdpi/ch_614_logo.png
index cc7841ce..cc7841ce 100644
--- a/tests/input/res/drawable-xhdpi/ch_614_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_614_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_615_logo.png b/tests/common/res/drawable-xhdpi/ch_615_logo.png
index 6c38d269..6c38d269 100644
--- a/tests/input/res/drawable-xhdpi/ch_615_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_615_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_616_logo.png b/tests/common/res/drawable-xhdpi/ch_616_logo.png
index e11b777d..e11b777d 100644
--- a/tests/input/res/drawable-xhdpi/ch_616_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_616_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_617_logo.png b/tests/common/res/drawable-xhdpi/ch_617_logo.png
index 78aeb608..78aeb608 100644
--- a/tests/input/res/drawable-xhdpi/ch_617_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_617_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_618_logo.png b/tests/common/res/drawable-xhdpi/ch_618_logo.png
index e1f883fb..e1f883fb 100644
--- a/tests/input/res/drawable-xhdpi/ch_618_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_618_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_619_logo.png b/tests/common/res/drawable-xhdpi/ch_619_logo.png
index 75f4eeba..75f4eeba 100644
--- a/tests/input/res/drawable-xhdpi/ch_619_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_619_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_61_logo.png b/tests/common/res/drawable-xhdpi/ch_61_logo.png
index 801cb923..801cb923 100644
--- a/tests/input/res/drawable-xhdpi/ch_61_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_61_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_620_logo.png b/tests/common/res/drawable-xhdpi/ch_620_logo.png
index b6380b73..b6380b73 100644
--- a/tests/input/res/drawable-xhdpi/ch_620_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_620_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_621_logo.png b/tests/common/res/drawable-xhdpi/ch_621_logo.png
index e6a53185..e6a53185 100644
--- a/tests/input/res/drawable-xhdpi/ch_621_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_621_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_622_logo.png b/tests/common/res/drawable-xhdpi/ch_622_logo.png
index 1cde4b8f..1cde4b8f 100644
--- a/tests/input/res/drawable-xhdpi/ch_622_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_622_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_623_logo.png b/tests/common/res/drawable-xhdpi/ch_623_logo.png
index f271e516..f271e516 100644
--- a/tests/input/res/drawable-xhdpi/ch_623_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_623_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_624_logo.png b/tests/common/res/drawable-xhdpi/ch_624_logo.png
index 21343a8c..21343a8c 100644
--- a/tests/input/res/drawable-xhdpi/ch_624_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_624_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_625_logo.png b/tests/common/res/drawable-xhdpi/ch_625_logo.png
index e15b9853..e15b9853 100644
--- a/tests/input/res/drawable-xhdpi/ch_625_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_625_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_626_logo.png b/tests/common/res/drawable-xhdpi/ch_626_logo.png
index c1f8e273..c1f8e273 100644
--- a/tests/input/res/drawable-xhdpi/ch_626_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_626_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_627_logo.png b/tests/common/res/drawable-xhdpi/ch_627_logo.png
index c07973b5..c07973b5 100644
--- a/tests/input/res/drawable-xhdpi/ch_627_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_627_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_628_logo.png b/tests/common/res/drawable-xhdpi/ch_628_logo.png
index 369240ca..369240ca 100644
--- a/tests/input/res/drawable-xhdpi/ch_628_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_628_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_629_logo.png b/tests/common/res/drawable-xhdpi/ch_629_logo.png
index ac9f7bd7..ac9f7bd7 100644
--- a/tests/input/res/drawable-xhdpi/ch_629_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_629_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_62_logo.png b/tests/common/res/drawable-xhdpi/ch_62_logo.png
index c4b48ea7..c4b48ea7 100644
--- a/tests/input/res/drawable-xhdpi/ch_62_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_62_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_630_logo.png b/tests/common/res/drawable-xhdpi/ch_630_logo.png
index 4959855a..4959855a 100644
--- a/tests/input/res/drawable-xhdpi/ch_630_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_630_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_631_logo.png b/tests/common/res/drawable-xhdpi/ch_631_logo.png
index e03e2706..e03e2706 100644
--- a/tests/input/res/drawable-xhdpi/ch_631_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_631_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_632_logo.png b/tests/common/res/drawable-xhdpi/ch_632_logo.png
index 5be9d478..5be9d478 100644
--- a/tests/input/res/drawable-xhdpi/ch_632_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_632_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_633_logo.png b/tests/common/res/drawable-xhdpi/ch_633_logo.png
index 9c51c4a7..9c51c4a7 100644
--- a/tests/input/res/drawable-xhdpi/ch_633_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_633_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_634_logo.png b/tests/common/res/drawable-xhdpi/ch_634_logo.png
index 72d30bc6..72d30bc6 100644
--- a/tests/input/res/drawable-xhdpi/ch_634_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_634_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_635_logo.png b/tests/common/res/drawable-xhdpi/ch_635_logo.png
index 6c03f3c5..6c03f3c5 100644
--- a/tests/input/res/drawable-xhdpi/ch_635_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_635_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_636_logo.png b/tests/common/res/drawable-xhdpi/ch_636_logo.png
index 928a67c2..928a67c2 100644
--- a/tests/input/res/drawable-xhdpi/ch_636_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_636_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_637_logo.png b/tests/common/res/drawable-xhdpi/ch_637_logo.png
index 4a07f186..4a07f186 100644
--- a/tests/input/res/drawable-xhdpi/ch_637_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_637_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_638_logo.png b/tests/common/res/drawable-xhdpi/ch_638_logo.png
index 33813958..33813958 100644
--- a/tests/input/res/drawable-xhdpi/ch_638_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_638_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_639_logo.png b/tests/common/res/drawable-xhdpi/ch_639_logo.png
index be6ba122..be6ba122 100644
--- a/tests/input/res/drawable-xhdpi/ch_639_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_639_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_63_logo.png b/tests/common/res/drawable-xhdpi/ch_63_logo.png
index dd84e2e6..dd84e2e6 100644
--- a/tests/input/res/drawable-xhdpi/ch_63_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_63_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_640_logo.png b/tests/common/res/drawable-xhdpi/ch_640_logo.png
index f6e1750c..f6e1750c 100644
--- a/tests/input/res/drawable-xhdpi/ch_640_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_640_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_641_logo.png b/tests/common/res/drawable-xhdpi/ch_641_logo.png
index 421019c8..421019c8 100644
--- a/tests/input/res/drawable-xhdpi/ch_641_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_641_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_642_logo.png b/tests/common/res/drawable-xhdpi/ch_642_logo.png
index e441876c..e441876c 100644
--- a/tests/input/res/drawable-xhdpi/ch_642_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_642_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_643_logo.png b/tests/common/res/drawable-xhdpi/ch_643_logo.png
index 29745014..29745014 100644
--- a/tests/input/res/drawable-xhdpi/ch_643_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_643_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_644_logo.png b/tests/common/res/drawable-xhdpi/ch_644_logo.png
index f5e4f2a0..f5e4f2a0 100644
--- a/tests/input/res/drawable-xhdpi/ch_644_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_644_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_645_logo.png b/tests/common/res/drawable-xhdpi/ch_645_logo.png
index bfa0d2cd..bfa0d2cd 100644
--- a/tests/input/res/drawable-xhdpi/ch_645_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_645_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_646_logo.png b/tests/common/res/drawable-xhdpi/ch_646_logo.png
index d148f910..d148f910 100644
--- a/tests/input/res/drawable-xhdpi/ch_646_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_646_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_647_logo.png b/tests/common/res/drawable-xhdpi/ch_647_logo.png
index cccc2c66..cccc2c66 100644
--- a/tests/input/res/drawable-xhdpi/ch_647_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_647_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_648_logo.png b/tests/common/res/drawable-xhdpi/ch_648_logo.png
index 1fa3cad7..1fa3cad7 100644
--- a/tests/input/res/drawable-xhdpi/ch_648_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_648_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_649_logo.png b/tests/common/res/drawable-xhdpi/ch_649_logo.png
index 0958fd36..0958fd36 100644
--- a/tests/input/res/drawable-xhdpi/ch_649_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_649_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_64_logo.png b/tests/common/res/drawable-xhdpi/ch_64_logo.png
index 9a6a84ec..9a6a84ec 100644
--- a/tests/input/res/drawable-xhdpi/ch_64_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_64_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_650_logo.png b/tests/common/res/drawable-xhdpi/ch_650_logo.png
index bd3ab1f0..bd3ab1f0 100644
--- a/tests/input/res/drawable-xhdpi/ch_650_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_650_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_651_logo.png b/tests/common/res/drawable-xhdpi/ch_651_logo.png
index 03e859a0..03e859a0 100644
--- a/tests/input/res/drawable-xhdpi/ch_651_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_651_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_652_logo.png b/tests/common/res/drawable-xhdpi/ch_652_logo.png
index 81b61689..81b61689 100644
--- a/tests/input/res/drawable-xhdpi/ch_652_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_652_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_653_logo.png b/tests/common/res/drawable-xhdpi/ch_653_logo.png
index f6665e5f..f6665e5f 100644
--- a/tests/input/res/drawable-xhdpi/ch_653_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_653_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_654_logo.png b/tests/common/res/drawable-xhdpi/ch_654_logo.png
index 6ca0e57c..6ca0e57c 100644
--- a/tests/input/res/drawable-xhdpi/ch_654_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_654_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_655_logo.png b/tests/common/res/drawable-xhdpi/ch_655_logo.png
index 51e7b392..51e7b392 100644
--- a/tests/input/res/drawable-xhdpi/ch_655_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_655_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_656_logo.png b/tests/common/res/drawable-xhdpi/ch_656_logo.png
index bae25480..bae25480 100644
--- a/tests/input/res/drawable-xhdpi/ch_656_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_656_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_657_logo.png b/tests/common/res/drawable-xhdpi/ch_657_logo.png
index 029e91c9..029e91c9 100644
--- a/tests/input/res/drawable-xhdpi/ch_657_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_657_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_658_logo.png b/tests/common/res/drawable-xhdpi/ch_658_logo.png
index 61a77eac..61a77eac 100644
--- a/tests/input/res/drawable-xhdpi/ch_658_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_658_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_659_logo.png b/tests/common/res/drawable-xhdpi/ch_659_logo.png
index f12e97ee..f12e97ee 100644
--- a/tests/input/res/drawable-xhdpi/ch_659_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_659_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_65_logo.png b/tests/common/res/drawable-xhdpi/ch_65_logo.png
index b770749e..b770749e 100644
--- a/tests/input/res/drawable-xhdpi/ch_65_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_65_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_660_logo.png b/tests/common/res/drawable-xhdpi/ch_660_logo.png
index 1408fb45..1408fb45 100644
--- a/tests/input/res/drawable-xhdpi/ch_660_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_660_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_661_logo.png b/tests/common/res/drawable-xhdpi/ch_661_logo.png
index f8224b76..f8224b76 100644
--- a/tests/input/res/drawable-xhdpi/ch_661_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_661_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_662_logo.png b/tests/common/res/drawable-xhdpi/ch_662_logo.png
index 08d36a1b..08d36a1b 100644
--- a/tests/input/res/drawable-xhdpi/ch_662_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_662_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_663_logo.png b/tests/common/res/drawable-xhdpi/ch_663_logo.png
index b95c596c..b95c596c 100644
--- a/tests/input/res/drawable-xhdpi/ch_663_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_663_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_664_logo.png b/tests/common/res/drawable-xhdpi/ch_664_logo.png
index 4c42427a..4c42427a 100644
--- a/tests/input/res/drawable-xhdpi/ch_664_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_664_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_665_logo.png b/tests/common/res/drawable-xhdpi/ch_665_logo.png
index c8918dce..c8918dce 100644
--- a/tests/input/res/drawable-xhdpi/ch_665_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_665_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_666_logo.png b/tests/common/res/drawable-xhdpi/ch_666_logo.png
index 6839f828..6839f828 100644
--- a/tests/input/res/drawable-xhdpi/ch_666_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_666_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_667_logo.png b/tests/common/res/drawable-xhdpi/ch_667_logo.png
index 28702195..28702195 100644
--- a/tests/input/res/drawable-xhdpi/ch_667_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_667_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_668_logo.png b/tests/common/res/drawable-xhdpi/ch_668_logo.png
index 944a8d46..944a8d46 100644
--- a/tests/input/res/drawable-xhdpi/ch_668_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_668_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_669_logo.png b/tests/common/res/drawable-xhdpi/ch_669_logo.png
index 2677744f..2677744f 100644
--- a/tests/input/res/drawable-xhdpi/ch_669_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_669_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_66_logo.png b/tests/common/res/drawable-xhdpi/ch_66_logo.png
index e298eb86..e298eb86 100644
--- a/tests/input/res/drawable-xhdpi/ch_66_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_66_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_670_logo.png b/tests/common/res/drawable-xhdpi/ch_670_logo.png
index bcb1d377..bcb1d377 100644
--- a/tests/input/res/drawable-xhdpi/ch_670_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_670_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_671_logo.png b/tests/common/res/drawable-xhdpi/ch_671_logo.png
index 3e01dba8..3e01dba8 100644
--- a/tests/input/res/drawable-xhdpi/ch_671_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_671_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_672_logo.png b/tests/common/res/drawable-xhdpi/ch_672_logo.png
index 478d3f22..478d3f22 100644
--- a/tests/input/res/drawable-xhdpi/ch_672_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_672_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_673_logo.png b/tests/common/res/drawable-xhdpi/ch_673_logo.png
index 123522db..123522db 100644
--- a/tests/input/res/drawable-xhdpi/ch_673_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_673_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_674_logo.png b/tests/common/res/drawable-xhdpi/ch_674_logo.png
index 25c44806..25c44806 100644
--- a/tests/input/res/drawable-xhdpi/ch_674_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_674_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_675_logo.png b/tests/common/res/drawable-xhdpi/ch_675_logo.png
index 223ba448..223ba448 100644
--- a/tests/input/res/drawable-xhdpi/ch_675_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_675_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_676_logo.png b/tests/common/res/drawable-xhdpi/ch_676_logo.png
index 12cca720..12cca720 100644
--- a/tests/input/res/drawable-xhdpi/ch_676_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_676_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_677_logo.png b/tests/common/res/drawable-xhdpi/ch_677_logo.png
index ec735de1..ec735de1 100644
--- a/tests/input/res/drawable-xhdpi/ch_677_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_677_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_678_logo.png b/tests/common/res/drawable-xhdpi/ch_678_logo.png
index 1eee9496..1eee9496 100644
--- a/tests/input/res/drawable-xhdpi/ch_678_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_678_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_679_logo.png b/tests/common/res/drawable-xhdpi/ch_679_logo.png
index 231b68eb..231b68eb 100644
--- a/tests/input/res/drawable-xhdpi/ch_679_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_679_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_67_logo.png b/tests/common/res/drawable-xhdpi/ch_67_logo.png
index 5fcf7946..5fcf7946 100644
--- a/tests/input/res/drawable-xhdpi/ch_67_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_67_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_680_logo.png b/tests/common/res/drawable-xhdpi/ch_680_logo.png
index 24c09b87..24c09b87 100644
--- a/tests/input/res/drawable-xhdpi/ch_680_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_680_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_681_logo.png b/tests/common/res/drawable-xhdpi/ch_681_logo.png
index 2bae5da6..2bae5da6 100644
--- a/tests/input/res/drawable-xhdpi/ch_681_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_681_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_682_logo.png b/tests/common/res/drawable-xhdpi/ch_682_logo.png
index 6bb1047f..6bb1047f 100644
--- a/tests/input/res/drawable-xhdpi/ch_682_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_682_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_683_logo.png b/tests/common/res/drawable-xhdpi/ch_683_logo.png
index 04be69f4..04be69f4 100644
--- a/tests/input/res/drawable-xhdpi/ch_683_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_683_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_684_logo.png b/tests/common/res/drawable-xhdpi/ch_684_logo.png
index 02e0666d..02e0666d 100644
--- a/tests/input/res/drawable-xhdpi/ch_684_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_684_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_685_logo.png b/tests/common/res/drawable-xhdpi/ch_685_logo.png
index ff410e54..ff410e54 100644
--- a/tests/input/res/drawable-xhdpi/ch_685_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_685_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_686_logo.png b/tests/common/res/drawable-xhdpi/ch_686_logo.png
index f93e7d7f..f93e7d7f 100644
--- a/tests/input/res/drawable-xhdpi/ch_686_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_686_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_687_logo.png b/tests/common/res/drawable-xhdpi/ch_687_logo.png
index a97a96f4..a97a96f4 100644
--- a/tests/input/res/drawable-xhdpi/ch_687_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_687_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_688_logo.png b/tests/common/res/drawable-xhdpi/ch_688_logo.png
index f094f64c..f094f64c 100644
--- a/tests/input/res/drawable-xhdpi/ch_688_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_688_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_689_logo.png b/tests/common/res/drawable-xhdpi/ch_689_logo.png
index c557b3f1..c557b3f1 100644
--- a/tests/input/res/drawable-xhdpi/ch_689_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_689_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_68_logo.png b/tests/common/res/drawable-xhdpi/ch_68_logo.png
index 957bcb55..957bcb55 100644
--- a/tests/input/res/drawable-xhdpi/ch_68_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_68_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_690_logo.png b/tests/common/res/drawable-xhdpi/ch_690_logo.png
index ee692d35..ee692d35 100644
--- a/tests/input/res/drawable-xhdpi/ch_690_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_690_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_691_logo.png b/tests/common/res/drawable-xhdpi/ch_691_logo.png
index 7087605e..7087605e 100644
--- a/tests/input/res/drawable-xhdpi/ch_691_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_691_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_692_logo.png b/tests/common/res/drawable-xhdpi/ch_692_logo.png
index 902b536f..902b536f 100644
--- a/tests/input/res/drawable-xhdpi/ch_692_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_692_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_693_logo.png b/tests/common/res/drawable-xhdpi/ch_693_logo.png
index 3fb1634e..3fb1634e 100644
--- a/tests/input/res/drawable-xhdpi/ch_693_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_693_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_694_logo.png b/tests/common/res/drawable-xhdpi/ch_694_logo.png
index baaa7b69..baaa7b69 100644
--- a/tests/input/res/drawable-xhdpi/ch_694_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_694_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_695_logo.png b/tests/common/res/drawable-xhdpi/ch_695_logo.png
index 1d957bfd..1d957bfd 100644
--- a/tests/input/res/drawable-xhdpi/ch_695_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_695_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_696_logo.png b/tests/common/res/drawable-xhdpi/ch_696_logo.png
index ca8ed9e8..ca8ed9e8 100644
--- a/tests/input/res/drawable-xhdpi/ch_696_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_696_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_697_logo.png b/tests/common/res/drawable-xhdpi/ch_697_logo.png
index e01c4825..e01c4825 100644
--- a/tests/input/res/drawable-xhdpi/ch_697_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_697_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_698_logo.png b/tests/common/res/drawable-xhdpi/ch_698_logo.png
index c6540359..c6540359 100644
--- a/tests/input/res/drawable-xhdpi/ch_698_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_698_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_699_logo.png b/tests/common/res/drawable-xhdpi/ch_699_logo.png
index 70a22946..70a22946 100644
--- a/tests/input/res/drawable-xhdpi/ch_699_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_699_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_69_logo.png b/tests/common/res/drawable-xhdpi/ch_69_logo.png
index 6ccbe33b..6ccbe33b 100644
--- a/tests/input/res/drawable-xhdpi/ch_69_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_69_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_6_logo.png b/tests/common/res/drawable-xhdpi/ch_6_logo.png
index 22887a6c..22887a6c 100644
--- a/tests/input/res/drawable-xhdpi/ch_6_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_6_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_700_logo.png b/tests/common/res/drawable-xhdpi/ch_700_logo.png
index 1cbf5379..1cbf5379 100644
--- a/tests/input/res/drawable-xhdpi/ch_700_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_700_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_701_logo.png b/tests/common/res/drawable-xhdpi/ch_701_logo.png
index 9b438c00..9b438c00 100644
--- a/tests/input/res/drawable-xhdpi/ch_701_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_701_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_702_logo.png b/tests/common/res/drawable-xhdpi/ch_702_logo.png
index 92bef76d..92bef76d 100644
--- a/tests/input/res/drawable-xhdpi/ch_702_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_702_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_703_logo.png b/tests/common/res/drawable-xhdpi/ch_703_logo.png
index 78d680b0..78d680b0 100644
--- a/tests/input/res/drawable-xhdpi/ch_703_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_703_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_704_logo.png b/tests/common/res/drawable-xhdpi/ch_704_logo.png
index fcb61adb..fcb61adb 100644
--- a/tests/input/res/drawable-xhdpi/ch_704_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_704_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_705_logo.png b/tests/common/res/drawable-xhdpi/ch_705_logo.png
index 87566617..87566617 100644
--- a/tests/input/res/drawable-xhdpi/ch_705_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_705_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_706_logo.png b/tests/common/res/drawable-xhdpi/ch_706_logo.png
index fe9d775b..fe9d775b 100644
--- a/tests/input/res/drawable-xhdpi/ch_706_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_706_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_707_logo.png b/tests/common/res/drawable-xhdpi/ch_707_logo.png
index b3b0451c..b3b0451c 100644
--- a/tests/input/res/drawable-xhdpi/ch_707_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_707_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_708_logo.png b/tests/common/res/drawable-xhdpi/ch_708_logo.png
index 2a95b3a4..2a95b3a4 100644
--- a/tests/input/res/drawable-xhdpi/ch_708_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_708_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_709_logo.png b/tests/common/res/drawable-xhdpi/ch_709_logo.png
index 55111fbe..55111fbe 100644
--- a/tests/input/res/drawable-xhdpi/ch_709_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_709_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_70_logo.png b/tests/common/res/drawable-xhdpi/ch_70_logo.png
index 1860ec9c..1860ec9c 100644
--- a/tests/input/res/drawable-xhdpi/ch_70_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_70_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_710_logo.png b/tests/common/res/drawable-xhdpi/ch_710_logo.png
index 6284e6ee..6284e6ee 100644
--- a/tests/input/res/drawable-xhdpi/ch_710_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_710_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_711_logo.png b/tests/common/res/drawable-xhdpi/ch_711_logo.png
index d55d32ca..d55d32ca 100644
--- a/tests/input/res/drawable-xhdpi/ch_711_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_711_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_712_logo.png b/tests/common/res/drawable-xhdpi/ch_712_logo.png
index 7268941c..7268941c 100644
--- a/tests/input/res/drawable-xhdpi/ch_712_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_712_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_713_logo.png b/tests/common/res/drawable-xhdpi/ch_713_logo.png
index 781301e4..781301e4 100644
--- a/tests/input/res/drawable-xhdpi/ch_713_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_713_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_714_logo.png b/tests/common/res/drawable-xhdpi/ch_714_logo.png
index 8145eaac..8145eaac 100644
--- a/tests/input/res/drawable-xhdpi/ch_714_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_714_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_715_logo.png b/tests/common/res/drawable-xhdpi/ch_715_logo.png
index b7715dc5..b7715dc5 100644
--- a/tests/input/res/drawable-xhdpi/ch_715_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_715_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_716_logo.png b/tests/common/res/drawable-xhdpi/ch_716_logo.png
index 0c1f26e4..0c1f26e4 100644
--- a/tests/input/res/drawable-xhdpi/ch_716_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_716_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_717_logo.png b/tests/common/res/drawable-xhdpi/ch_717_logo.png
index de20828f..de20828f 100644
--- a/tests/input/res/drawable-xhdpi/ch_717_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_717_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_718_logo.png b/tests/common/res/drawable-xhdpi/ch_718_logo.png
index 8d915ecc..8d915ecc 100644
--- a/tests/input/res/drawable-xhdpi/ch_718_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_718_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_719_logo.png b/tests/common/res/drawable-xhdpi/ch_719_logo.png
index bd1c668d..bd1c668d 100644
--- a/tests/input/res/drawable-xhdpi/ch_719_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_719_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_71_logo.png b/tests/common/res/drawable-xhdpi/ch_71_logo.png
index e3f8b550..e3f8b550 100644
--- a/tests/input/res/drawable-xhdpi/ch_71_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_71_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_720_logo.png b/tests/common/res/drawable-xhdpi/ch_720_logo.png
index 66a60923..66a60923 100644
--- a/tests/input/res/drawable-xhdpi/ch_720_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_720_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_721_logo.png b/tests/common/res/drawable-xhdpi/ch_721_logo.png
index c877d396..c877d396 100644
--- a/tests/input/res/drawable-xhdpi/ch_721_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_721_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_722_logo.png b/tests/common/res/drawable-xhdpi/ch_722_logo.png
index 9fe37161..9fe37161 100644
--- a/tests/input/res/drawable-xhdpi/ch_722_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_722_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_723_logo.png b/tests/common/res/drawable-xhdpi/ch_723_logo.png
index 94563ccd..94563ccd 100644
--- a/tests/input/res/drawable-xhdpi/ch_723_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_723_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_724_logo.png b/tests/common/res/drawable-xhdpi/ch_724_logo.png
index 52e5fcd9..52e5fcd9 100644
--- a/tests/input/res/drawable-xhdpi/ch_724_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_724_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_725_logo.png b/tests/common/res/drawable-xhdpi/ch_725_logo.png
index 518fefaa..518fefaa 100644
--- a/tests/input/res/drawable-xhdpi/ch_725_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_725_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_726_logo.png b/tests/common/res/drawable-xhdpi/ch_726_logo.png
index 1f28222e..1f28222e 100644
--- a/tests/input/res/drawable-xhdpi/ch_726_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_726_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_727_logo.png b/tests/common/res/drawable-xhdpi/ch_727_logo.png
index bffbc57f..bffbc57f 100644
--- a/tests/input/res/drawable-xhdpi/ch_727_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_727_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_728_logo.png b/tests/common/res/drawable-xhdpi/ch_728_logo.png
index f036778b..f036778b 100644
--- a/tests/input/res/drawable-xhdpi/ch_728_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_728_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_729_logo.png b/tests/common/res/drawable-xhdpi/ch_729_logo.png
index a2838d56..a2838d56 100644
--- a/tests/input/res/drawable-xhdpi/ch_729_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_729_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_72_logo.png b/tests/common/res/drawable-xhdpi/ch_72_logo.png
index 5b2f971c..5b2f971c 100644
--- a/tests/input/res/drawable-xhdpi/ch_72_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_72_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_730_logo.png b/tests/common/res/drawable-xhdpi/ch_730_logo.png
index 443d08b8..443d08b8 100644
--- a/tests/input/res/drawable-xhdpi/ch_730_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_730_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_731_logo.png b/tests/common/res/drawable-xhdpi/ch_731_logo.png
index d07e52a1..d07e52a1 100644
--- a/tests/input/res/drawable-xhdpi/ch_731_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_731_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_732_logo.png b/tests/common/res/drawable-xhdpi/ch_732_logo.png
index 56f51b3f..56f51b3f 100644
--- a/tests/input/res/drawable-xhdpi/ch_732_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_732_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_733_logo.png b/tests/common/res/drawable-xhdpi/ch_733_logo.png
index 18248b0a..18248b0a 100644
--- a/tests/input/res/drawable-xhdpi/ch_733_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_733_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_734_logo.png b/tests/common/res/drawable-xhdpi/ch_734_logo.png
index fb740e33..fb740e33 100644
--- a/tests/input/res/drawable-xhdpi/ch_734_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_734_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_735_logo.png b/tests/common/res/drawable-xhdpi/ch_735_logo.png
index 9f83309f..9f83309f 100644
--- a/tests/input/res/drawable-xhdpi/ch_735_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_735_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_736_logo.png b/tests/common/res/drawable-xhdpi/ch_736_logo.png
index 768fc5ef..768fc5ef 100644
--- a/tests/input/res/drawable-xhdpi/ch_736_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_736_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_737_logo.png b/tests/common/res/drawable-xhdpi/ch_737_logo.png
index 6af65c67..6af65c67 100644
--- a/tests/input/res/drawable-xhdpi/ch_737_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_737_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_738_logo.png b/tests/common/res/drawable-xhdpi/ch_738_logo.png
index 3b908312..3b908312 100644
--- a/tests/input/res/drawable-xhdpi/ch_738_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_738_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_739_logo.png b/tests/common/res/drawable-xhdpi/ch_739_logo.png
index fea61e37..fea61e37 100644
--- a/tests/input/res/drawable-xhdpi/ch_739_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_739_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_73_logo.png b/tests/common/res/drawable-xhdpi/ch_73_logo.png
index 13556e6d..13556e6d 100644
--- a/tests/input/res/drawable-xhdpi/ch_73_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_73_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_740_logo.png b/tests/common/res/drawable-xhdpi/ch_740_logo.png
index 7fe9aa19..7fe9aa19 100644
--- a/tests/input/res/drawable-xhdpi/ch_740_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_740_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_741_logo.png b/tests/common/res/drawable-xhdpi/ch_741_logo.png
index a437fd22..a437fd22 100644
--- a/tests/input/res/drawable-xhdpi/ch_741_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_741_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_742_logo.png b/tests/common/res/drawable-xhdpi/ch_742_logo.png
index 5674dccb..5674dccb 100644
--- a/tests/input/res/drawable-xhdpi/ch_742_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_742_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_743_logo.png b/tests/common/res/drawable-xhdpi/ch_743_logo.png
index dbfcaa51..dbfcaa51 100644
--- a/tests/input/res/drawable-xhdpi/ch_743_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_743_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_744_logo.png b/tests/common/res/drawable-xhdpi/ch_744_logo.png
index fe6dd633..fe6dd633 100644
--- a/tests/input/res/drawable-xhdpi/ch_744_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_744_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_745_logo.png b/tests/common/res/drawable-xhdpi/ch_745_logo.png
index 703bc014..703bc014 100644
--- a/tests/input/res/drawable-xhdpi/ch_745_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_745_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_746_logo.png b/tests/common/res/drawable-xhdpi/ch_746_logo.png
index 15775a4c..15775a4c 100644
--- a/tests/input/res/drawable-xhdpi/ch_746_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_746_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_747_logo.png b/tests/common/res/drawable-xhdpi/ch_747_logo.png
index d5666758..d5666758 100644
--- a/tests/input/res/drawable-xhdpi/ch_747_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_747_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_748_logo.png b/tests/common/res/drawable-xhdpi/ch_748_logo.png
index 3bb80444..3bb80444 100644
--- a/tests/input/res/drawable-xhdpi/ch_748_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_748_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_749_logo.png b/tests/common/res/drawable-xhdpi/ch_749_logo.png
index 92a6954a..92a6954a 100644
--- a/tests/input/res/drawable-xhdpi/ch_749_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_749_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_74_logo.png b/tests/common/res/drawable-xhdpi/ch_74_logo.png
index 484f4c0d..484f4c0d 100644
--- a/tests/input/res/drawable-xhdpi/ch_74_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_74_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_750_logo.png b/tests/common/res/drawable-xhdpi/ch_750_logo.png
index 96af0fa6..96af0fa6 100644
--- a/tests/input/res/drawable-xhdpi/ch_750_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_750_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_751_logo.png b/tests/common/res/drawable-xhdpi/ch_751_logo.png
index bddc6d97..bddc6d97 100644
--- a/tests/input/res/drawable-xhdpi/ch_751_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_751_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_752_logo.png b/tests/common/res/drawable-xhdpi/ch_752_logo.png
index 38d693f7..38d693f7 100644
--- a/tests/input/res/drawable-xhdpi/ch_752_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_752_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_753_logo.png b/tests/common/res/drawable-xhdpi/ch_753_logo.png
index 3c383de7..3c383de7 100644
--- a/tests/input/res/drawable-xhdpi/ch_753_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_753_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_754_logo.png b/tests/common/res/drawable-xhdpi/ch_754_logo.png
index 04d7b62b..04d7b62b 100644
--- a/tests/input/res/drawable-xhdpi/ch_754_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_754_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_755_logo.png b/tests/common/res/drawable-xhdpi/ch_755_logo.png
index d7846b43..d7846b43 100644
--- a/tests/input/res/drawable-xhdpi/ch_755_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_755_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_756_logo.png b/tests/common/res/drawable-xhdpi/ch_756_logo.png
index 6b51e7d1..6b51e7d1 100644
--- a/tests/input/res/drawable-xhdpi/ch_756_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_756_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_757_logo.png b/tests/common/res/drawable-xhdpi/ch_757_logo.png
index b396d7c3..b396d7c3 100644
--- a/tests/input/res/drawable-xhdpi/ch_757_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_757_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_758_logo.png b/tests/common/res/drawable-xhdpi/ch_758_logo.png
index d77783b7..d77783b7 100644
--- a/tests/input/res/drawable-xhdpi/ch_758_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_758_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_759_logo.png b/tests/common/res/drawable-xhdpi/ch_759_logo.png
index ca26792b..ca26792b 100644
--- a/tests/input/res/drawable-xhdpi/ch_759_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_759_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_75_logo.png b/tests/common/res/drawable-xhdpi/ch_75_logo.png
index aa78479e..aa78479e 100644
--- a/tests/input/res/drawable-xhdpi/ch_75_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_75_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_760_logo.png b/tests/common/res/drawable-xhdpi/ch_760_logo.png
index 5d56db66..5d56db66 100644
--- a/tests/input/res/drawable-xhdpi/ch_760_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_760_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_761_logo.png b/tests/common/res/drawable-xhdpi/ch_761_logo.png
index e505365d..e505365d 100644
--- a/tests/input/res/drawable-xhdpi/ch_761_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_761_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_762_logo.png b/tests/common/res/drawable-xhdpi/ch_762_logo.png
index 202b7572..202b7572 100644
--- a/tests/input/res/drawable-xhdpi/ch_762_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_762_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_763_logo.png b/tests/common/res/drawable-xhdpi/ch_763_logo.png
index 14af6ab4..14af6ab4 100644
--- a/tests/input/res/drawable-xhdpi/ch_763_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_763_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_764_logo.png b/tests/common/res/drawable-xhdpi/ch_764_logo.png
index c4e1ea66..c4e1ea66 100644
--- a/tests/input/res/drawable-xhdpi/ch_764_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_764_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_765_logo.png b/tests/common/res/drawable-xhdpi/ch_765_logo.png
index 3b5ded8e..3b5ded8e 100644
--- a/tests/input/res/drawable-xhdpi/ch_765_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_765_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_766_logo.png b/tests/common/res/drawable-xhdpi/ch_766_logo.png
index 61391524..61391524 100644
--- a/tests/input/res/drawable-xhdpi/ch_766_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_766_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_767_logo.png b/tests/common/res/drawable-xhdpi/ch_767_logo.png
index 4fa0441e..4fa0441e 100644
--- a/tests/input/res/drawable-xhdpi/ch_767_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_767_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_768_logo.png b/tests/common/res/drawable-xhdpi/ch_768_logo.png
index 80e8293b..80e8293b 100644
--- a/tests/input/res/drawable-xhdpi/ch_768_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_768_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_769_logo.png b/tests/common/res/drawable-xhdpi/ch_769_logo.png
index 63c2e6cc..63c2e6cc 100644
--- a/tests/input/res/drawable-xhdpi/ch_769_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_769_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_76_logo.png b/tests/common/res/drawable-xhdpi/ch_76_logo.png
index 3ebf6807..3ebf6807 100644
--- a/tests/input/res/drawable-xhdpi/ch_76_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_76_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_770_logo.png b/tests/common/res/drawable-xhdpi/ch_770_logo.png
index b2ee3584..b2ee3584 100644
--- a/tests/input/res/drawable-xhdpi/ch_770_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_770_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_771_logo.png b/tests/common/res/drawable-xhdpi/ch_771_logo.png
index 9a53a498..9a53a498 100644
--- a/tests/input/res/drawable-xhdpi/ch_771_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_771_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_772_logo.png b/tests/common/res/drawable-xhdpi/ch_772_logo.png
index 1da9e70d..1da9e70d 100644
--- a/tests/input/res/drawable-xhdpi/ch_772_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_772_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_773_logo.png b/tests/common/res/drawable-xhdpi/ch_773_logo.png
index 0f35e46a..0f35e46a 100644
--- a/tests/input/res/drawable-xhdpi/ch_773_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_773_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_774_logo.png b/tests/common/res/drawable-xhdpi/ch_774_logo.png
index acaa8857..acaa8857 100644
--- a/tests/input/res/drawable-xhdpi/ch_774_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_774_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_775_logo.png b/tests/common/res/drawable-xhdpi/ch_775_logo.png
index 70ca99e8..70ca99e8 100644
--- a/tests/input/res/drawable-xhdpi/ch_775_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_775_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_776_logo.png b/tests/common/res/drawable-xhdpi/ch_776_logo.png
index ab54947d..ab54947d 100644
--- a/tests/input/res/drawable-xhdpi/ch_776_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_776_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_777_logo.png b/tests/common/res/drawable-xhdpi/ch_777_logo.png
index ed378329..ed378329 100644
--- a/tests/input/res/drawable-xhdpi/ch_777_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_777_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_778_logo.png b/tests/common/res/drawable-xhdpi/ch_778_logo.png
index 01cdc4e8..01cdc4e8 100644
--- a/tests/input/res/drawable-xhdpi/ch_778_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_778_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_779_logo.png b/tests/common/res/drawable-xhdpi/ch_779_logo.png
index ca5175f7..ca5175f7 100644
--- a/tests/input/res/drawable-xhdpi/ch_779_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_779_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_77_logo.png b/tests/common/res/drawable-xhdpi/ch_77_logo.png
index c22abf24..c22abf24 100644
--- a/tests/input/res/drawable-xhdpi/ch_77_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_77_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_780_logo.png b/tests/common/res/drawable-xhdpi/ch_780_logo.png
index 2e5f24e2..2e5f24e2 100644
--- a/tests/input/res/drawable-xhdpi/ch_780_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_780_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_781_logo.png b/tests/common/res/drawable-xhdpi/ch_781_logo.png
index 81e5ed66..81e5ed66 100644
--- a/tests/input/res/drawable-xhdpi/ch_781_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_781_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_782_logo.png b/tests/common/res/drawable-xhdpi/ch_782_logo.png
index 3236afa9..3236afa9 100644
--- a/tests/input/res/drawable-xhdpi/ch_782_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_782_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_783_logo.png b/tests/common/res/drawable-xhdpi/ch_783_logo.png
index a600800e..a600800e 100644
--- a/tests/input/res/drawable-xhdpi/ch_783_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_783_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_784_logo.png b/tests/common/res/drawable-xhdpi/ch_784_logo.png
index cd97c5eb..cd97c5eb 100644
--- a/tests/input/res/drawable-xhdpi/ch_784_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_784_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_785_logo.png b/tests/common/res/drawable-xhdpi/ch_785_logo.png
index d50fd82a..d50fd82a 100644
--- a/tests/input/res/drawable-xhdpi/ch_785_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_785_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_786_logo.png b/tests/common/res/drawable-xhdpi/ch_786_logo.png
index 7a93ef71..7a93ef71 100644
--- a/tests/input/res/drawable-xhdpi/ch_786_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_786_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_787_logo.png b/tests/common/res/drawable-xhdpi/ch_787_logo.png
index 62b5cf6b..62b5cf6b 100644
--- a/tests/input/res/drawable-xhdpi/ch_787_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_787_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_788_logo.png b/tests/common/res/drawable-xhdpi/ch_788_logo.png
index c82602d3..c82602d3 100644
--- a/tests/input/res/drawable-xhdpi/ch_788_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_788_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_789_logo.png b/tests/common/res/drawable-xhdpi/ch_789_logo.png
index 7dfbeeb3..7dfbeeb3 100644
--- a/tests/input/res/drawable-xhdpi/ch_789_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_789_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_78_logo.png b/tests/common/res/drawable-xhdpi/ch_78_logo.png
index 03fb415f..03fb415f 100644
--- a/tests/input/res/drawable-xhdpi/ch_78_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_78_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_790_logo.png b/tests/common/res/drawable-xhdpi/ch_790_logo.png
index d44c2181..d44c2181 100644
--- a/tests/input/res/drawable-xhdpi/ch_790_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_790_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_791_logo.png b/tests/common/res/drawable-xhdpi/ch_791_logo.png
index ee81b961..ee81b961 100644
--- a/tests/input/res/drawable-xhdpi/ch_791_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_791_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_792_logo.png b/tests/common/res/drawable-xhdpi/ch_792_logo.png
index 37715025..37715025 100644
--- a/tests/input/res/drawable-xhdpi/ch_792_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_792_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_793_logo.png b/tests/common/res/drawable-xhdpi/ch_793_logo.png
index eca3a477..eca3a477 100644
--- a/tests/input/res/drawable-xhdpi/ch_793_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_793_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_794_logo.png b/tests/common/res/drawable-xhdpi/ch_794_logo.png
index fbbfc372..fbbfc372 100644
--- a/tests/input/res/drawable-xhdpi/ch_794_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_794_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_795_logo.png b/tests/common/res/drawable-xhdpi/ch_795_logo.png
index 0366a2bd..0366a2bd 100644
--- a/tests/input/res/drawable-xhdpi/ch_795_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_795_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_796_logo.png b/tests/common/res/drawable-xhdpi/ch_796_logo.png
index e13e6bc1..e13e6bc1 100644
--- a/tests/input/res/drawable-xhdpi/ch_796_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_796_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_797_logo.png b/tests/common/res/drawable-xhdpi/ch_797_logo.png
index e45decc0..e45decc0 100644
--- a/tests/input/res/drawable-xhdpi/ch_797_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_797_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_798_logo.png b/tests/common/res/drawable-xhdpi/ch_798_logo.png
index 6b9659e2..6b9659e2 100644
--- a/tests/input/res/drawable-xhdpi/ch_798_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_798_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_799_logo.png b/tests/common/res/drawable-xhdpi/ch_799_logo.png
index e8cb2ef8..e8cb2ef8 100644
--- a/tests/input/res/drawable-xhdpi/ch_799_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_799_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_79_logo.png b/tests/common/res/drawable-xhdpi/ch_79_logo.png
index 237fa7b2..237fa7b2 100644
--- a/tests/input/res/drawable-xhdpi/ch_79_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_79_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_7_logo.png b/tests/common/res/drawable-xhdpi/ch_7_logo.png
index df78066a..df78066a 100644
--- a/tests/input/res/drawable-xhdpi/ch_7_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_7_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_800_logo.png b/tests/common/res/drawable-xhdpi/ch_800_logo.png
index 6c775941..6c775941 100644
--- a/tests/input/res/drawable-xhdpi/ch_800_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_800_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_801_logo.png b/tests/common/res/drawable-xhdpi/ch_801_logo.png
index f0006515..f0006515 100644
--- a/tests/input/res/drawable-xhdpi/ch_801_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_801_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_802_logo.png b/tests/common/res/drawable-xhdpi/ch_802_logo.png
index 4c504b58..4c504b58 100644
--- a/tests/input/res/drawable-xhdpi/ch_802_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_802_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_803_logo.png b/tests/common/res/drawable-xhdpi/ch_803_logo.png
index edfa6869..edfa6869 100644
--- a/tests/input/res/drawable-xhdpi/ch_803_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_803_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_804_logo.png b/tests/common/res/drawable-xhdpi/ch_804_logo.png
index c7b0dba0..c7b0dba0 100644
--- a/tests/input/res/drawable-xhdpi/ch_804_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_804_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_805_logo.png b/tests/common/res/drawable-xhdpi/ch_805_logo.png
index bcd6ee28..bcd6ee28 100644
--- a/tests/input/res/drawable-xhdpi/ch_805_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_805_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_806_logo.png b/tests/common/res/drawable-xhdpi/ch_806_logo.png
index e926e9f4..e926e9f4 100644
--- a/tests/input/res/drawable-xhdpi/ch_806_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_806_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_807_logo.png b/tests/common/res/drawable-xhdpi/ch_807_logo.png
index 25334551..25334551 100644
--- a/tests/input/res/drawable-xhdpi/ch_807_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_807_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_808_logo.png b/tests/common/res/drawable-xhdpi/ch_808_logo.png
index 5d7b51a9..5d7b51a9 100644
--- a/tests/input/res/drawable-xhdpi/ch_808_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_808_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_809_logo.png b/tests/common/res/drawable-xhdpi/ch_809_logo.png
index 2f6a8e31..2f6a8e31 100644
--- a/tests/input/res/drawable-xhdpi/ch_809_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_809_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_80_logo.png b/tests/common/res/drawable-xhdpi/ch_80_logo.png
index ff7a55c1..ff7a55c1 100644
--- a/tests/input/res/drawable-xhdpi/ch_80_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_80_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_810_logo.png b/tests/common/res/drawable-xhdpi/ch_810_logo.png
index 1a083992..1a083992 100644
--- a/tests/input/res/drawable-xhdpi/ch_810_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_810_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_811_logo.png b/tests/common/res/drawable-xhdpi/ch_811_logo.png
index 070df630..070df630 100644
--- a/tests/input/res/drawable-xhdpi/ch_811_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_811_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_812_logo.png b/tests/common/res/drawable-xhdpi/ch_812_logo.png
index 376e68cb..376e68cb 100644
--- a/tests/input/res/drawable-xhdpi/ch_812_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_812_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_813_logo.png b/tests/common/res/drawable-xhdpi/ch_813_logo.png
index d72f0a8e..d72f0a8e 100644
--- a/tests/input/res/drawable-xhdpi/ch_813_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_813_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_814_logo.png b/tests/common/res/drawable-xhdpi/ch_814_logo.png
index b50d9ad1..b50d9ad1 100644
--- a/tests/input/res/drawable-xhdpi/ch_814_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_814_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_815_logo.png b/tests/common/res/drawable-xhdpi/ch_815_logo.png
index fdbc4cdd..fdbc4cdd 100644
--- a/tests/input/res/drawable-xhdpi/ch_815_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_815_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_816_logo.png b/tests/common/res/drawable-xhdpi/ch_816_logo.png
index f1212200..f1212200 100644
--- a/tests/input/res/drawable-xhdpi/ch_816_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_816_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_817_logo.png b/tests/common/res/drawable-xhdpi/ch_817_logo.png
index be4fa008..be4fa008 100644
--- a/tests/input/res/drawable-xhdpi/ch_817_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_817_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_818_logo.png b/tests/common/res/drawable-xhdpi/ch_818_logo.png
index c9d087d7..c9d087d7 100644
--- a/tests/input/res/drawable-xhdpi/ch_818_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_818_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_819_logo.png b/tests/common/res/drawable-xhdpi/ch_819_logo.png
index b8cab83d..b8cab83d 100644
--- a/tests/input/res/drawable-xhdpi/ch_819_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_819_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_81_logo.png b/tests/common/res/drawable-xhdpi/ch_81_logo.png
index 58f6fc00..58f6fc00 100644
--- a/tests/input/res/drawable-xhdpi/ch_81_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_81_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_820_logo.png b/tests/common/res/drawable-xhdpi/ch_820_logo.png
index 3bf591fb..3bf591fb 100644
--- a/tests/input/res/drawable-xhdpi/ch_820_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_820_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_821_logo.png b/tests/common/res/drawable-xhdpi/ch_821_logo.png
index 16046f46..16046f46 100644
--- a/tests/input/res/drawable-xhdpi/ch_821_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_821_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_822_logo.png b/tests/common/res/drawable-xhdpi/ch_822_logo.png
index 58d688c9..58d688c9 100644
--- a/tests/input/res/drawable-xhdpi/ch_822_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_822_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_823_logo.png b/tests/common/res/drawable-xhdpi/ch_823_logo.png
index 6b70ecc1..6b70ecc1 100644
--- a/tests/input/res/drawable-xhdpi/ch_823_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_823_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_824_logo.png b/tests/common/res/drawable-xhdpi/ch_824_logo.png
index 4c90c96e..4c90c96e 100644
--- a/tests/input/res/drawable-xhdpi/ch_824_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_824_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_825_logo.png b/tests/common/res/drawable-xhdpi/ch_825_logo.png
index 5111136c..5111136c 100644
--- a/tests/input/res/drawable-xhdpi/ch_825_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_825_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_826_logo.png b/tests/common/res/drawable-xhdpi/ch_826_logo.png
index f35941e8..f35941e8 100644
--- a/tests/input/res/drawable-xhdpi/ch_826_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_826_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_827_logo.png b/tests/common/res/drawable-xhdpi/ch_827_logo.png
index 49add1ab..49add1ab 100644
--- a/tests/input/res/drawable-xhdpi/ch_827_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_827_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_828_logo.png b/tests/common/res/drawable-xhdpi/ch_828_logo.png
index 67936aa4..67936aa4 100644
--- a/tests/input/res/drawable-xhdpi/ch_828_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_828_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_829_logo.png b/tests/common/res/drawable-xhdpi/ch_829_logo.png
index 7bc97945..7bc97945 100644
--- a/tests/input/res/drawable-xhdpi/ch_829_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_829_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_82_logo.png b/tests/common/res/drawable-xhdpi/ch_82_logo.png
index ddd21127..ddd21127 100644
--- a/tests/input/res/drawable-xhdpi/ch_82_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_82_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_830_logo.png b/tests/common/res/drawable-xhdpi/ch_830_logo.png
index 3aa669d8..3aa669d8 100644
--- a/tests/input/res/drawable-xhdpi/ch_830_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_830_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_831_logo.png b/tests/common/res/drawable-xhdpi/ch_831_logo.png
index f7c2cf1c..f7c2cf1c 100644
--- a/tests/input/res/drawable-xhdpi/ch_831_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_831_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_832_logo.png b/tests/common/res/drawable-xhdpi/ch_832_logo.png
index 19096734..19096734 100644
--- a/tests/input/res/drawable-xhdpi/ch_832_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_832_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_833_logo.png b/tests/common/res/drawable-xhdpi/ch_833_logo.png
index d0a1af2f..d0a1af2f 100644
--- a/tests/input/res/drawable-xhdpi/ch_833_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_833_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_834_logo.png b/tests/common/res/drawable-xhdpi/ch_834_logo.png
index 52e2ef58..52e2ef58 100644
--- a/tests/input/res/drawable-xhdpi/ch_834_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_834_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_835_logo.png b/tests/common/res/drawable-xhdpi/ch_835_logo.png
index 7ac421e1..7ac421e1 100644
--- a/tests/input/res/drawable-xhdpi/ch_835_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_835_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_836_logo.png b/tests/common/res/drawable-xhdpi/ch_836_logo.png
index 7f4577b4..7f4577b4 100644
--- a/tests/input/res/drawable-xhdpi/ch_836_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_836_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_837_logo.png b/tests/common/res/drawable-xhdpi/ch_837_logo.png
index df5e1c86..df5e1c86 100644
--- a/tests/input/res/drawable-xhdpi/ch_837_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_837_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_838_logo.png b/tests/common/res/drawable-xhdpi/ch_838_logo.png
index 579557ed..579557ed 100644
--- a/tests/input/res/drawable-xhdpi/ch_838_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_838_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_839_logo.png b/tests/common/res/drawable-xhdpi/ch_839_logo.png
index 3988cc5b..3988cc5b 100644
--- a/tests/input/res/drawable-xhdpi/ch_839_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_839_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_83_logo.png b/tests/common/res/drawable-xhdpi/ch_83_logo.png
index dd97e15c..dd97e15c 100644
--- a/tests/input/res/drawable-xhdpi/ch_83_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_83_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_840_logo.png b/tests/common/res/drawable-xhdpi/ch_840_logo.png
index 29e88d2a..29e88d2a 100644
--- a/tests/input/res/drawable-xhdpi/ch_840_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_840_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_841_logo.png b/tests/common/res/drawable-xhdpi/ch_841_logo.png
index 9ee069a4..9ee069a4 100644
--- a/tests/input/res/drawable-xhdpi/ch_841_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_841_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_842_logo.png b/tests/common/res/drawable-xhdpi/ch_842_logo.png
index edbd8c57..edbd8c57 100644
--- a/tests/input/res/drawable-xhdpi/ch_842_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_842_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_843_logo.png b/tests/common/res/drawable-xhdpi/ch_843_logo.png
index 7ee70de2..7ee70de2 100644
--- a/tests/input/res/drawable-xhdpi/ch_843_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_843_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_844_logo.png b/tests/common/res/drawable-xhdpi/ch_844_logo.png
index 6a0a95a8..6a0a95a8 100644
--- a/tests/input/res/drawable-xhdpi/ch_844_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_844_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_845_logo.png b/tests/common/res/drawable-xhdpi/ch_845_logo.png
index ae4aa7eb..ae4aa7eb 100644
--- a/tests/input/res/drawable-xhdpi/ch_845_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_845_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_846_logo.png b/tests/common/res/drawable-xhdpi/ch_846_logo.png
index 79eb61d9..79eb61d9 100644
--- a/tests/input/res/drawable-xhdpi/ch_846_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_846_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_847_logo.png b/tests/common/res/drawable-xhdpi/ch_847_logo.png
index 2a8fd743..2a8fd743 100644
--- a/tests/input/res/drawable-xhdpi/ch_847_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_847_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_848_logo.png b/tests/common/res/drawable-xhdpi/ch_848_logo.png
index c2e82237..c2e82237 100644
--- a/tests/input/res/drawable-xhdpi/ch_848_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_848_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_849_logo.png b/tests/common/res/drawable-xhdpi/ch_849_logo.png
index 44d58b8d..44d58b8d 100644
--- a/tests/input/res/drawable-xhdpi/ch_849_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_849_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_84_logo.png b/tests/common/res/drawable-xhdpi/ch_84_logo.png
index 5ad6a473..5ad6a473 100644
--- a/tests/input/res/drawable-xhdpi/ch_84_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_84_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_850_logo.png b/tests/common/res/drawable-xhdpi/ch_850_logo.png
index 358dc326..358dc326 100644
--- a/tests/input/res/drawable-xhdpi/ch_850_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_850_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_851_logo.png b/tests/common/res/drawable-xhdpi/ch_851_logo.png
index 7c5ef9cd..7c5ef9cd 100644
--- a/tests/input/res/drawable-xhdpi/ch_851_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_851_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_852_logo.png b/tests/common/res/drawable-xhdpi/ch_852_logo.png
index 0ab1e98b..0ab1e98b 100644
--- a/tests/input/res/drawable-xhdpi/ch_852_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_852_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_853_logo.png b/tests/common/res/drawable-xhdpi/ch_853_logo.png
index c5b6a11b..c5b6a11b 100644
--- a/tests/input/res/drawable-xhdpi/ch_853_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_853_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_854_logo.png b/tests/common/res/drawable-xhdpi/ch_854_logo.png
index 5c34d4e2..5c34d4e2 100644
--- a/tests/input/res/drawable-xhdpi/ch_854_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_854_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_855_logo.png b/tests/common/res/drawable-xhdpi/ch_855_logo.png
index b8f10da8..b8f10da8 100644
--- a/tests/input/res/drawable-xhdpi/ch_855_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_855_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_856_logo.png b/tests/common/res/drawable-xhdpi/ch_856_logo.png
index 1b790da7..1b790da7 100644
--- a/tests/input/res/drawable-xhdpi/ch_856_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_856_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_857_logo.png b/tests/common/res/drawable-xhdpi/ch_857_logo.png
index a7f3b55d..a7f3b55d 100644
--- a/tests/input/res/drawable-xhdpi/ch_857_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_857_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_858_logo.png b/tests/common/res/drawable-xhdpi/ch_858_logo.png
index e3555be6..e3555be6 100644
--- a/tests/input/res/drawable-xhdpi/ch_858_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_858_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_859_logo.png b/tests/common/res/drawable-xhdpi/ch_859_logo.png
index 970ee63e..970ee63e 100644
--- a/tests/input/res/drawable-xhdpi/ch_859_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_859_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_85_logo.png b/tests/common/res/drawable-xhdpi/ch_85_logo.png
index 35c5c992..35c5c992 100644
--- a/tests/input/res/drawable-xhdpi/ch_85_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_85_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_860_logo.png b/tests/common/res/drawable-xhdpi/ch_860_logo.png
index 72720501..72720501 100644
--- a/tests/input/res/drawable-xhdpi/ch_860_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_860_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_861_logo.png b/tests/common/res/drawable-xhdpi/ch_861_logo.png
index bf6d0be9..bf6d0be9 100644
--- a/tests/input/res/drawable-xhdpi/ch_861_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_861_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_862_logo.png b/tests/common/res/drawable-xhdpi/ch_862_logo.png
index ee6c88f2..ee6c88f2 100644
--- a/tests/input/res/drawable-xhdpi/ch_862_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_862_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_863_logo.png b/tests/common/res/drawable-xhdpi/ch_863_logo.png
index 9b92ef30..9b92ef30 100644
--- a/tests/input/res/drawable-xhdpi/ch_863_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_863_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_864_logo.png b/tests/common/res/drawable-xhdpi/ch_864_logo.png
index 2024e828..2024e828 100644
--- a/tests/input/res/drawable-xhdpi/ch_864_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_864_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_865_logo.png b/tests/common/res/drawable-xhdpi/ch_865_logo.png
index 80b87668..80b87668 100644
--- a/tests/input/res/drawable-xhdpi/ch_865_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_865_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_866_logo.png b/tests/common/res/drawable-xhdpi/ch_866_logo.png
index 6dfe8538..6dfe8538 100644
--- a/tests/input/res/drawable-xhdpi/ch_866_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_866_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_867_logo.png b/tests/common/res/drawable-xhdpi/ch_867_logo.png
index 6cb51f22..6cb51f22 100644
--- a/tests/input/res/drawable-xhdpi/ch_867_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_867_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_868_logo.png b/tests/common/res/drawable-xhdpi/ch_868_logo.png
index e179e5cf..e179e5cf 100644
--- a/tests/input/res/drawable-xhdpi/ch_868_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_868_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_869_logo.png b/tests/common/res/drawable-xhdpi/ch_869_logo.png
index 940780eb..940780eb 100644
--- a/tests/input/res/drawable-xhdpi/ch_869_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_869_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_86_logo.png b/tests/common/res/drawable-xhdpi/ch_86_logo.png
index 93bbad73..93bbad73 100644
--- a/tests/input/res/drawable-xhdpi/ch_86_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_86_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_870_logo.png b/tests/common/res/drawable-xhdpi/ch_870_logo.png
index caa05fe8..caa05fe8 100644
--- a/tests/input/res/drawable-xhdpi/ch_870_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_870_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_871_logo.png b/tests/common/res/drawable-xhdpi/ch_871_logo.png
index 9085b8a8..9085b8a8 100644
--- a/tests/input/res/drawable-xhdpi/ch_871_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_871_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_872_logo.png b/tests/common/res/drawable-xhdpi/ch_872_logo.png
index 695dabaf..695dabaf 100644
--- a/tests/input/res/drawable-xhdpi/ch_872_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_872_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_873_logo.png b/tests/common/res/drawable-xhdpi/ch_873_logo.png
index 21871509..21871509 100644
--- a/tests/input/res/drawable-xhdpi/ch_873_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_873_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_874_logo.png b/tests/common/res/drawable-xhdpi/ch_874_logo.png
index 2bbcf9cc..2bbcf9cc 100644
--- a/tests/input/res/drawable-xhdpi/ch_874_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_874_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_875_logo.png b/tests/common/res/drawable-xhdpi/ch_875_logo.png
index 494b8ebc..494b8ebc 100644
--- a/tests/input/res/drawable-xhdpi/ch_875_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_875_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_876_logo.png b/tests/common/res/drawable-xhdpi/ch_876_logo.png
index eded05e4..eded05e4 100644
--- a/tests/input/res/drawable-xhdpi/ch_876_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_876_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_877_logo.png b/tests/common/res/drawable-xhdpi/ch_877_logo.png
index cf22732d..cf22732d 100644
--- a/tests/input/res/drawable-xhdpi/ch_877_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_877_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_878_logo.png b/tests/common/res/drawable-xhdpi/ch_878_logo.png
index 3ca881cf..3ca881cf 100644
--- a/tests/input/res/drawable-xhdpi/ch_878_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_878_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_879_logo.png b/tests/common/res/drawable-xhdpi/ch_879_logo.png
index 8f629b25..8f629b25 100644
--- a/tests/input/res/drawable-xhdpi/ch_879_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_879_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_87_logo.png b/tests/common/res/drawable-xhdpi/ch_87_logo.png
index 1a661da8..1a661da8 100644
--- a/tests/input/res/drawable-xhdpi/ch_87_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_87_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_880_logo.png b/tests/common/res/drawable-xhdpi/ch_880_logo.png
index f23459d8..f23459d8 100644
--- a/tests/input/res/drawable-xhdpi/ch_880_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_880_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_881_logo.png b/tests/common/res/drawable-xhdpi/ch_881_logo.png
index 810320be..810320be 100644
--- a/tests/input/res/drawable-xhdpi/ch_881_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_881_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_882_logo.png b/tests/common/res/drawable-xhdpi/ch_882_logo.png
index cee19fc9..cee19fc9 100644
--- a/tests/input/res/drawable-xhdpi/ch_882_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_882_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_883_logo.png b/tests/common/res/drawable-xhdpi/ch_883_logo.png
index b7cd2a11..b7cd2a11 100644
--- a/tests/input/res/drawable-xhdpi/ch_883_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_883_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_884_logo.png b/tests/common/res/drawable-xhdpi/ch_884_logo.png
index ee24315c..ee24315c 100644
--- a/tests/input/res/drawable-xhdpi/ch_884_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_884_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_885_logo.png b/tests/common/res/drawable-xhdpi/ch_885_logo.png
index aac4f31f..aac4f31f 100644
--- a/tests/input/res/drawable-xhdpi/ch_885_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_885_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_886_logo.png b/tests/common/res/drawable-xhdpi/ch_886_logo.png
index d929436e..d929436e 100644
--- a/tests/input/res/drawable-xhdpi/ch_886_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_886_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_887_logo.png b/tests/common/res/drawable-xhdpi/ch_887_logo.png
index 4d38b4c9..4d38b4c9 100644
--- a/tests/input/res/drawable-xhdpi/ch_887_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_887_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_888_logo.png b/tests/common/res/drawable-xhdpi/ch_888_logo.png
index b8bf4191..b8bf4191 100644
--- a/tests/input/res/drawable-xhdpi/ch_888_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_888_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_889_logo.png b/tests/common/res/drawable-xhdpi/ch_889_logo.png
index e38f60dd..e38f60dd 100644
--- a/tests/input/res/drawable-xhdpi/ch_889_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_889_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_88_logo.png b/tests/common/res/drawable-xhdpi/ch_88_logo.png
index 9cf19a3b..9cf19a3b 100644
--- a/tests/input/res/drawable-xhdpi/ch_88_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_88_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_890_logo.png b/tests/common/res/drawable-xhdpi/ch_890_logo.png
index 46e8755c..46e8755c 100644
--- a/tests/input/res/drawable-xhdpi/ch_890_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_890_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_891_logo.png b/tests/common/res/drawable-xhdpi/ch_891_logo.png
index 8fcae156..8fcae156 100644
--- a/tests/input/res/drawable-xhdpi/ch_891_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_891_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_892_logo.png b/tests/common/res/drawable-xhdpi/ch_892_logo.png
index 4672b7e1..4672b7e1 100644
--- a/tests/input/res/drawable-xhdpi/ch_892_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_892_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_893_logo.png b/tests/common/res/drawable-xhdpi/ch_893_logo.png
index 170586f5..170586f5 100644
--- a/tests/input/res/drawable-xhdpi/ch_893_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_893_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_894_logo.png b/tests/common/res/drawable-xhdpi/ch_894_logo.png
index 4b366898..4b366898 100644
--- a/tests/input/res/drawable-xhdpi/ch_894_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_894_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_895_logo.png b/tests/common/res/drawable-xhdpi/ch_895_logo.png
index 1855d24c..1855d24c 100644
--- a/tests/input/res/drawable-xhdpi/ch_895_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_895_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_896_logo.png b/tests/common/res/drawable-xhdpi/ch_896_logo.png
index dc47d447..dc47d447 100644
--- a/tests/input/res/drawable-xhdpi/ch_896_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_896_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_897_logo.png b/tests/common/res/drawable-xhdpi/ch_897_logo.png
index 909a60e0..909a60e0 100644
--- a/tests/input/res/drawable-xhdpi/ch_897_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_897_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_898_logo.png b/tests/common/res/drawable-xhdpi/ch_898_logo.png
index a57a6344..a57a6344 100644
--- a/tests/input/res/drawable-xhdpi/ch_898_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_898_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_899_logo.png b/tests/common/res/drawable-xhdpi/ch_899_logo.png
index fa99418a..fa99418a 100644
--- a/tests/input/res/drawable-xhdpi/ch_899_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_899_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_89_logo.png b/tests/common/res/drawable-xhdpi/ch_89_logo.png
index 0c7edc8c..0c7edc8c 100644
--- a/tests/input/res/drawable-xhdpi/ch_89_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_89_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_8_logo.png b/tests/common/res/drawable-xhdpi/ch_8_logo.png
index 0886b851..0886b851 100644
--- a/tests/input/res/drawable-xhdpi/ch_8_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_8_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_900_logo.png b/tests/common/res/drawable-xhdpi/ch_900_logo.png
index cf6327bb..cf6327bb 100644
--- a/tests/input/res/drawable-xhdpi/ch_900_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_900_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_901_logo.png b/tests/common/res/drawable-xhdpi/ch_901_logo.png
index 17e1c9ef..17e1c9ef 100644
--- a/tests/input/res/drawable-xhdpi/ch_901_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_901_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_902_logo.png b/tests/common/res/drawable-xhdpi/ch_902_logo.png
index f98b40cb..f98b40cb 100644
--- a/tests/input/res/drawable-xhdpi/ch_902_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_902_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_903_logo.png b/tests/common/res/drawable-xhdpi/ch_903_logo.png
index d3d331d8..d3d331d8 100644
--- a/tests/input/res/drawable-xhdpi/ch_903_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_903_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_904_logo.png b/tests/common/res/drawable-xhdpi/ch_904_logo.png
index d3e29be6..d3e29be6 100644
--- a/tests/input/res/drawable-xhdpi/ch_904_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_904_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_905_logo.png b/tests/common/res/drawable-xhdpi/ch_905_logo.png
index 65ab0adc..65ab0adc 100644
--- a/tests/input/res/drawable-xhdpi/ch_905_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_905_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_906_logo.png b/tests/common/res/drawable-xhdpi/ch_906_logo.png
index 1cc924d7..1cc924d7 100644
--- a/tests/input/res/drawable-xhdpi/ch_906_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_906_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_907_logo.png b/tests/common/res/drawable-xhdpi/ch_907_logo.png
index 9fd37e6e..9fd37e6e 100644
--- a/tests/input/res/drawable-xhdpi/ch_907_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_907_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_908_logo.png b/tests/common/res/drawable-xhdpi/ch_908_logo.png
index 15597dba..15597dba 100644
--- a/tests/input/res/drawable-xhdpi/ch_908_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_908_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_909_logo.png b/tests/common/res/drawable-xhdpi/ch_909_logo.png
index db80fbef..db80fbef 100644
--- a/tests/input/res/drawable-xhdpi/ch_909_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_909_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_90_logo.png b/tests/common/res/drawable-xhdpi/ch_90_logo.png
index 2f2960da..2f2960da 100644
--- a/tests/input/res/drawable-xhdpi/ch_90_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_90_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_910_logo.png b/tests/common/res/drawable-xhdpi/ch_910_logo.png
index dd6f8a31..dd6f8a31 100644
--- a/tests/input/res/drawable-xhdpi/ch_910_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_910_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_911_logo.png b/tests/common/res/drawable-xhdpi/ch_911_logo.png
index 23266b64..23266b64 100644
--- a/tests/input/res/drawable-xhdpi/ch_911_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_911_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_912_logo.png b/tests/common/res/drawable-xhdpi/ch_912_logo.png
index 677197d5..677197d5 100644
--- a/tests/input/res/drawable-xhdpi/ch_912_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_912_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_913_logo.png b/tests/common/res/drawable-xhdpi/ch_913_logo.png
index 41c4ae03..41c4ae03 100644
--- a/tests/input/res/drawable-xhdpi/ch_913_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_913_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_914_logo.png b/tests/common/res/drawable-xhdpi/ch_914_logo.png
index 2a2b4a2d..2a2b4a2d 100644
--- a/tests/input/res/drawable-xhdpi/ch_914_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_914_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_915_logo.png b/tests/common/res/drawable-xhdpi/ch_915_logo.png
index 85941edf..85941edf 100644
--- a/tests/input/res/drawable-xhdpi/ch_915_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_915_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_916_logo.png b/tests/common/res/drawable-xhdpi/ch_916_logo.png
index fbf4a41e..fbf4a41e 100644
--- a/tests/input/res/drawable-xhdpi/ch_916_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_916_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_917_logo.png b/tests/common/res/drawable-xhdpi/ch_917_logo.png
index 018dff5e..018dff5e 100644
--- a/tests/input/res/drawable-xhdpi/ch_917_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_917_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_918_logo.png b/tests/common/res/drawable-xhdpi/ch_918_logo.png
index 2c8b0b80..2c8b0b80 100644
--- a/tests/input/res/drawable-xhdpi/ch_918_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_918_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_919_logo.png b/tests/common/res/drawable-xhdpi/ch_919_logo.png
index de2e6073..de2e6073 100644
--- a/tests/input/res/drawable-xhdpi/ch_919_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_919_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_91_logo.png b/tests/common/res/drawable-xhdpi/ch_91_logo.png
index 3992165b..3992165b 100644
--- a/tests/input/res/drawable-xhdpi/ch_91_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_91_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_920_logo.png b/tests/common/res/drawable-xhdpi/ch_920_logo.png
index 33839469..33839469 100644
--- a/tests/input/res/drawable-xhdpi/ch_920_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_920_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_921_logo.png b/tests/common/res/drawable-xhdpi/ch_921_logo.png
index 019c36f5..019c36f5 100644
--- a/tests/input/res/drawable-xhdpi/ch_921_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_921_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_922_logo.png b/tests/common/res/drawable-xhdpi/ch_922_logo.png
index 79e4e07d..79e4e07d 100644
--- a/tests/input/res/drawable-xhdpi/ch_922_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_922_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_923_logo.png b/tests/common/res/drawable-xhdpi/ch_923_logo.png
index 6738d938..6738d938 100644
--- a/tests/input/res/drawable-xhdpi/ch_923_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_923_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_924_logo.png b/tests/common/res/drawable-xhdpi/ch_924_logo.png
index 3cbc4e30..3cbc4e30 100644
--- a/tests/input/res/drawable-xhdpi/ch_924_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_924_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_925_logo.png b/tests/common/res/drawable-xhdpi/ch_925_logo.png
index 500111c1..500111c1 100644
--- a/tests/input/res/drawable-xhdpi/ch_925_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_925_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_926_logo.png b/tests/common/res/drawable-xhdpi/ch_926_logo.png
index bd3f94ad..bd3f94ad 100644
--- a/tests/input/res/drawable-xhdpi/ch_926_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_926_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_927_logo.png b/tests/common/res/drawable-xhdpi/ch_927_logo.png
index 51ad2eaa..51ad2eaa 100644
--- a/tests/input/res/drawable-xhdpi/ch_927_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_927_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_928_logo.png b/tests/common/res/drawable-xhdpi/ch_928_logo.png
index 6f579bb3..6f579bb3 100644
--- a/tests/input/res/drawable-xhdpi/ch_928_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_928_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_929_logo.png b/tests/common/res/drawable-xhdpi/ch_929_logo.png
index 79f11bb1..79f11bb1 100644
--- a/tests/input/res/drawable-xhdpi/ch_929_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_929_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_92_logo.png b/tests/common/res/drawable-xhdpi/ch_92_logo.png
index 25508036..25508036 100644
--- a/tests/input/res/drawable-xhdpi/ch_92_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_92_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_930_logo.png b/tests/common/res/drawable-xhdpi/ch_930_logo.png
index 4c06ad09..4c06ad09 100644
--- a/tests/input/res/drawable-xhdpi/ch_930_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_930_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_931_logo.png b/tests/common/res/drawable-xhdpi/ch_931_logo.png
index b7ac61ff..b7ac61ff 100644
--- a/tests/input/res/drawable-xhdpi/ch_931_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_931_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_932_logo.png b/tests/common/res/drawable-xhdpi/ch_932_logo.png
index cac5a477..cac5a477 100644
--- a/tests/input/res/drawable-xhdpi/ch_932_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_932_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_933_logo.png b/tests/common/res/drawable-xhdpi/ch_933_logo.png
index 959f957f..959f957f 100644
--- a/tests/input/res/drawable-xhdpi/ch_933_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_933_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_934_logo.png b/tests/common/res/drawable-xhdpi/ch_934_logo.png
index e9e5b263..e9e5b263 100644
--- a/tests/input/res/drawable-xhdpi/ch_934_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_934_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_935_logo.png b/tests/common/res/drawable-xhdpi/ch_935_logo.png
index 9741307e..9741307e 100644
--- a/tests/input/res/drawable-xhdpi/ch_935_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_935_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_936_logo.png b/tests/common/res/drawable-xhdpi/ch_936_logo.png
index 2c5964de..2c5964de 100644
--- a/tests/input/res/drawable-xhdpi/ch_936_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_936_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_937_logo.png b/tests/common/res/drawable-xhdpi/ch_937_logo.png
index 5392a73c..5392a73c 100644
--- a/tests/input/res/drawable-xhdpi/ch_937_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_937_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_938_logo.png b/tests/common/res/drawable-xhdpi/ch_938_logo.png
index 8350910c..8350910c 100644
--- a/tests/input/res/drawable-xhdpi/ch_938_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_938_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_939_logo.png b/tests/common/res/drawable-xhdpi/ch_939_logo.png
index f0635df0..f0635df0 100644
--- a/tests/input/res/drawable-xhdpi/ch_939_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_939_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_93_logo.png b/tests/common/res/drawable-xhdpi/ch_93_logo.png
index 976c07cb..976c07cb 100644
--- a/tests/input/res/drawable-xhdpi/ch_93_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_93_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_940_logo.png b/tests/common/res/drawable-xhdpi/ch_940_logo.png
index b9c76dbc..b9c76dbc 100644
--- a/tests/input/res/drawable-xhdpi/ch_940_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_940_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_941_logo.png b/tests/common/res/drawable-xhdpi/ch_941_logo.png
index d9e3361f..d9e3361f 100644
--- a/tests/input/res/drawable-xhdpi/ch_941_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_941_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_942_logo.png b/tests/common/res/drawable-xhdpi/ch_942_logo.png
index 997643c1..997643c1 100644
--- a/tests/input/res/drawable-xhdpi/ch_942_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_942_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_943_logo.png b/tests/common/res/drawable-xhdpi/ch_943_logo.png
index 4c6f1752..4c6f1752 100644
--- a/tests/input/res/drawable-xhdpi/ch_943_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_943_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_944_logo.png b/tests/common/res/drawable-xhdpi/ch_944_logo.png
index 40a11f40..40a11f40 100644
--- a/tests/input/res/drawable-xhdpi/ch_944_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_944_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_945_logo.png b/tests/common/res/drawable-xhdpi/ch_945_logo.png
index 9cc401a7..9cc401a7 100644
--- a/tests/input/res/drawable-xhdpi/ch_945_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_945_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_946_logo.png b/tests/common/res/drawable-xhdpi/ch_946_logo.png
index bdb5bab4..bdb5bab4 100644
--- a/tests/input/res/drawable-xhdpi/ch_946_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_946_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_947_logo.png b/tests/common/res/drawable-xhdpi/ch_947_logo.png
index 541b632d..541b632d 100644
--- a/tests/input/res/drawable-xhdpi/ch_947_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_947_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_948_logo.png b/tests/common/res/drawable-xhdpi/ch_948_logo.png
index 4db04738..4db04738 100644
--- a/tests/input/res/drawable-xhdpi/ch_948_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_948_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_949_logo.png b/tests/common/res/drawable-xhdpi/ch_949_logo.png
index 399a4e51..399a4e51 100644
--- a/tests/input/res/drawable-xhdpi/ch_949_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_949_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_94_logo.png b/tests/common/res/drawable-xhdpi/ch_94_logo.png
index e22800b8..e22800b8 100644
--- a/tests/input/res/drawable-xhdpi/ch_94_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_94_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_950_logo.png b/tests/common/res/drawable-xhdpi/ch_950_logo.png
index 5db6be41..5db6be41 100644
--- a/tests/input/res/drawable-xhdpi/ch_950_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_950_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_951_logo.png b/tests/common/res/drawable-xhdpi/ch_951_logo.png
index 6fbf5951..6fbf5951 100644
--- a/tests/input/res/drawable-xhdpi/ch_951_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_951_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_952_logo.png b/tests/common/res/drawable-xhdpi/ch_952_logo.png
index 0e5e39aa..0e5e39aa 100644
--- a/tests/input/res/drawable-xhdpi/ch_952_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_952_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_953_logo.png b/tests/common/res/drawable-xhdpi/ch_953_logo.png
index 430a5e4d..430a5e4d 100644
--- a/tests/input/res/drawable-xhdpi/ch_953_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_953_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_954_logo.png b/tests/common/res/drawable-xhdpi/ch_954_logo.png
index 8ddc6cee..8ddc6cee 100644
--- a/tests/input/res/drawable-xhdpi/ch_954_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_954_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_955_logo.png b/tests/common/res/drawable-xhdpi/ch_955_logo.png
index 69ec92b5..69ec92b5 100644
--- a/tests/input/res/drawable-xhdpi/ch_955_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_955_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_956_logo.png b/tests/common/res/drawable-xhdpi/ch_956_logo.png
index bc1edbd7..bc1edbd7 100644
--- a/tests/input/res/drawable-xhdpi/ch_956_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_956_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_957_logo.png b/tests/common/res/drawable-xhdpi/ch_957_logo.png
index 20db4202..20db4202 100644
--- a/tests/input/res/drawable-xhdpi/ch_957_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_957_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_958_logo.png b/tests/common/res/drawable-xhdpi/ch_958_logo.png
index 8e9a7a68..8e9a7a68 100644
--- a/tests/input/res/drawable-xhdpi/ch_958_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_958_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_959_logo.png b/tests/common/res/drawable-xhdpi/ch_959_logo.png
index 4d61c092..4d61c092 100644
--- a/tests/input/res/drawable-xhdpi/ch_959_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_959_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_95_logo.png b/tests/common/res/drawable-xhdpi/ch_95_logo.png
index 50cc5990..50cc5990 100644
--- a/tests/input/res/drawable-xhdpi/ch_95_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_95_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_960_logo.png b/tests/common/res/drawable-xhdpi/ch_960_logo.png
index b2a54413..b2a54413 100644
--- a/tests/input/res/drawable-xhdpi/ch_960_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_960_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_961_logo.png b/tests/common/res/drawable-xhdpi/ch_961_logo.png
index 5dc31323..5dc31323 100644
--- a/tests/input/res/drawable-xhdpi/ch_961_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_961_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_962_logo.png b/tests/common/res/drawable-xhdpi/ch_962_logo.png
index 4ef2a219..4ef2a219 100644
--- a/tests/input/res/drawable-xhdpi/ch_962_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_962_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_963_logo.png b/tests/common/res/drawable-xhdpi/ch_963_logo.png
index 22633d33..22633d33 100644
--- a/tests/input/res/drawable-xhdpi/ch_963_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_963_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_964_logo.png b/tests/common/res/drawable-xhdpi/ch_964_logo.png
index ba8ad46c..ba8ad46c 100644
--- a/tests/input/res/drawable-xhdpi/ch_964_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_964_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_965_logo.png b/tests/common/res/drawable-xhdpi/ch_965_logo.png
index 2c935852..2c935852 100644
--- a/tests/input/res/drawable-xhdpi/ch_965_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_965_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_966_logo.png b/tests/common/res/drawable-xhdpi/ch_966_logo.png
index 8b751988..8b751988 100644
--- a/tests/input/res/drawable-xhdpi/ch_966_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_966_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_967_logo.png b/tests/common/res/drawable-xhdpi/ch_967_logo.png
index 974712fd..974712fd 100644
--- a/tests/input/res/drawable-xhdpi/ch_967_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_967_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_968_logo.png b/tests/common/res/drawable-xhdpi/ch_968_logo.png
index d1edc191..d1edc191 100644
--- a/tests/input/res/drawable-xhdpi/ch_968_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_968_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_969_logo.png b/tests/common/res/drawable-xhdpi/ch_969_logo.png
index 7774ed92..7774ed92 100644
--- a/tests/input/res/drawable-xhdpi/ch_969_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_969_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_96_logo.png b/tests/common/res/drawable-xhdpi/ch_96_logo.png
index e37da468..e37da468 100644
--- a/tests/input/res/drawable-xhdpi/ch_96_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_96_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_970_logo.png b/tests/common/res/drawable-xhdpi/ch_970_logo.png
index 5dd52457..5dd52457 100644
--- a/tests/input/res/drawable-xhdpi/ch_970_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_970_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_971_logo.png b/tests/common/res/drawable-xhdpi/ch_971_logo.png
index 0aca871c..0aca871c 100644
--- a/tests/input/res/drawable-xhdpi/ch_971_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_971_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_972_logo.png b/tests/common/res/drawable-xhdpi/ch_972_logo.png
index 2f8803b5..2f8803b5 100644
--- a/tests/input/res/drawable-xhdpi/ch_972_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_972_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_973_logo.png b/tests/common/res/drawable-xhdpi/ch_973_logo.png
index 35ec5c90..35ec5c90 100644
--- a/tests/input/res/drawable-xhdpi/ch_973_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_973_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_974_logo.png b/tests/common/res/drawable-xhdpi/ch_974_logo.png
index 98f9a7aa..98f9a7aa 100644
--- a/tests/input/res/drawable-xhdpi/ch_974_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_974_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_975_logo.png b/tests/common/res/drawable-xhdpi/ch_975_logo.png
index bdc31316..bdc31316 100644
--- a/tests/input/res/drawable-xhdpi/ch_975_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_975_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_976_logo.png b/tests/common/res/drawable-xhdpi/ch_976_logo.png
index 078d35b7..078d35b7 100644
--- a/tests/input/res/drawable-xhdpi/ch_976_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_976_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_977_logo.png b/tests/common/res/drawable-xhdpi/ch_977_logo.png
index c6fbb7be..c6fbb7be 100644
--- a/tests/input/res/drawable-xhdpi/ch_977_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_977_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_978_logo.png b/tests/common/res/drawable-xhdpi/ch_978_logo.png
index 00a6e5e1..00a6e5e1 100644
--- a/tests/input/res/drawable-xhdpi/ch_978_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_978_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_979_logo.png b/tests/common/res/drawable-xhdpi/ch_979_logo.png
index fd1f56d1..fd1f56d1 100644
--- a/tests/input/res/drawable-xhdpi/ch_979_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_979_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_97_logo.png b/tests/common/res/drawable-xhdpi/ch_97_logo.png
index f852548a..f852548a 100644
--- a/tests/input/res/drawable-xhdpi/ch_97_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_97_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_980_logo.png b/tests/common/res/drawable-xhdpi/ch_980_logo.png
index 362a1988..362a1988 100644
--- a/tests/input/res/drawable-xhdpi/ch_980_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_980_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_981_logo.png b/tests/common/res/drawable-xhdpi/ch_981_logo.png
index 9f879c4b..9f879c4b 100644
--- a/tests/input/res/drawable-xhdpi/ch_981_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_981_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_982_logo.png b/tests/common/res/drawable-xhdpi/ch_982_logo.png
index 0d945a11..0d945a11 100644
--- a/tests/input/res/drawable-xhdpi/ch_982_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_982_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_983_logo.png b/tests/common/res/drawable-xhdpi/ch_983_logo.png
index ffeaddfc..ffeaddfc 100644
--- a/tests/input/res/drawable-xhdpi/ch_983_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_983_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_984_logo.png b/tests/common/res/drawable-xhdpi/ch_984_logo.png
index d8f92211..d8f92211 100644
--- a/tests/input/res/drawable-xhdpi/ch_984_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_984_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_985_logo.png b/tests/common/res/drawable-xhdpi/ch_985_logo.png
index b6c6f0dc..b6c6f0dc 100644
--- a/tests/input/res/drawable-xhdpi/ch_985_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_985_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_986_logo.png b/tests/common/res/drawable-xhdpi/ch_986_logo.png
index 8e2c0b50..8e2c0b50 100644
--- a/tests/input/res/drawable-xhdpi/ch_986_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_986_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_987_logo.png b/tests/common/res/drawable-xhdpi/ch_987_logo.png
index ce8c107a..ce8c107a 100644
--- a/tests/input/res/drawable-xhdpi/ch_987_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_987_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_988_logo.png b/tests/common/res/drawable-xhdpi/ch_988_logo.png
index ffa8ded7..ffa8ded7 100644
--- a/tests/input/res/drawable-xhdpi/ch_988_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_988_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_989_logo.png b/tests/common/res/drawable-xhdpi/ch_989_logo.png
index 8522a03a..8522a03a 100644
--- a/tests/input/res/drawable-xhdpi/ch_989_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_989_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_98_logo.png b/tests/common/res/drawable-xhdpi/ch_98_logo.png
index 13fe760f..13fe760f 100644
--- a/tests/input/res/drawable-xhdpi/ch_98_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_98_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_990_logo.png b/tests/common/res/drawable-xhdpi/ch_990_logo.png
index bd6df061..bd6df061 100644
--- a/tests/input/res/drawable-xhdpi/ch_990_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_990_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_991_logo.png b/tests/common/res/drawable-xhdpi/ch_991_logo.png
index 8611d57d..8611d57d 100644
--- a/tests/input/res/drawable-xhdpi/ch_991_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_991_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_992_logo.png b/tests/common/res/drawable-xhdpi/ch_992_logo.png
index 36d26bc0..36d26bc0 100644
--- a/tests/input/res/drawable-xhdpi/ch_992_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_992_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_993_logo.png b/tests/common/res/drawable-xhdpi/ch_993_logo.png
index f67e0eec..f67e0eec 100644
--- a/tests/input/res/drawable-xhdpi/ch_993_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_993_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_994_logo.png b/tests/common/res/drawable-xhdpi/ch_994_logo.png
index a63d5ee1..a63d5ee1 100644
--- a/tests/input/res/drawable-xhdpi/ch_994_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_994_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_995_logo.png b/tests/common/res/drawable-xhdpi/ch_995_logo.png
index b7b45167..b7b45167 100644
--- a/tests/input/res/drawable-xhdpi/ch_995_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_995_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_996_logo.png b/tests/common/res/drawable-xhdpi/ch_996_logo.png
index 82c042c3..82c042c3 100644
--- a/tests/input/res/drawable-xhdpi/ch_996_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_996_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_997_logo.png b/tests/common/res/drawable-xhdpi/ch_997_logo.png
index d70e4793..d70e4793 100644
--- a/tests/input/res/drawable-xhdpi/ch_997_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_997_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_998_logo.png b/tests/common/res/drawable-xhdpi/ch_998_logo.png
index f6c69d2e..f6c69d2e 100644
--- a/tests/input/res/drawable-xhdpi/ch_998_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_998_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_999_logo.png b/tests/common/res/drawable-xhdpi/ch_999_logo.png
index 844c06fd..844c06fd 100644
--- a/tests/input/res/drawable-xhdpi/ch_999_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_999_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_99_logo.png b/tests/common/res/drawable-xhdpi/ch_99_logo.png
index d8be447d..d8be447d 100644
--- a/tests/input/res/drawable-xhdpi/ch_99_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_99_logo.png
diff --git a/tests/input/res/drawable-xhdpi/ch_9_logo.png b/tests/common/res/drawable-xhdpi/ch_9_logo.png
index 8ba6bc55..8ba6bc55 100644
--- a/tests/input/res/drawable-xhdpi/ch_9_logo.png
+++ b/tests/common/res/drawable-xhdpi/ch_9_logo.png
diff --git a/tests/common/src/com/android/tv/testing/ChannelInfo.java b/tests/common/src/com/android/tv/testing/ChannelInfo.java
index af1c9891..946c0b55 100644
--- a/tests/common/src/com/android/tv/testing/ChannelInfo.java
+++ b/tests/common/src/com/android/tv/testing/ChannelInfo.java
@@ -16,9 +16,11 @@
 
 package com.android.tv.testing;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.database.Cursor;
 import android.media.tv.TvContract;
+import android.net.Uri;
 import android.support.annotation.Nullable;
 import android.util.SparseArray;
 
@@ -38,11 +40,6 @@ public final class ChannelInfo {
         VIDEO_HEIGHT_TO_FORMAT_MAP.put(4320, TvContract.Channels.VIDEO_FORMAT_4320P);
     }
 
-    /**
-     * If this is specify for logo, it will be selected randomly including null.
-     */
-    public static final String GENERATE_LOGO = "GEN";
-
     public static final String[] PROJECTION = {
             TvContract.Channels.COLUMN_DISPLAY_NUMBER,
             TvContract.Channels.COLUMN_DISPLAY_NAME,
@@ -80,15 +77,20 @@ public final class ChannelInfo {
                 .setOriginalNetworkId(channelNumber);
         if (context != null) {
             // tests/input/tools/get_test_logos.sh only stores 1000 logos.
-            int logo_num = (channelNumber % 1000);
-            builder.setLogoUrl(
-                    "android.resource://com.android.tv.testinput/drawable/ch_" + logo_num
-                            + "_logo"
-            );
+            builder.setLogoUrl(getUriStringForChannelLogo(context, channelNumber));
         }
         return builder.build();
     }
 
+    public static String getUriStringForChannelLogo(Context context, int logoIndex) {
+        int index = (logoIndex % 1000) + 1;
+        return new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
+                .authority(context.getPackageName())
+                .path("drawable")
+                .appendPath("ch_" + index + "_logo").build().toString();
+    }
+
     public static ChannelInfo fromCursor(Cursor c) {
         // TODO: Fill other fields.
         Builder builder = new Builder();
diff --git a/tests/common/src/com/android/tv/testing/Utils.java b/tests/common/src/com/android/tv/testing/Utils.java
index 66a13466..b2b4036e 100644
--- a/tests/common/src/com/android/tv/testing/Utils.java
+++ b/tests/common/src/com/android/tv/testing/Utils.java
@@ -19,16 +19,15 @@ package com.android.tv.testing;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.content.res.Resources;
 import android.media.tv.TvInputInfo;
 import android.media.tv.TvInputManager;
 import android.net.Uri;
-import android.os.Looper;
 import android.util.Log;
 
 import com.android.tv.common.TvCommonUtils;
-import com.android.tv.util.MainThreadExecutor;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,8 +36,6 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 import java.util.Random;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
 
 /**
  * An utility class for testing.
@@ -101,27 +98,6 @@ public final class Utils {
         return new Random(DEFAULT_RANDOM_SEED);
     }
 
-    /**
-     * Executes a call on the main thread, blocking until it is completed.
-     *
-     * <p>Useful for doing things that are not thread-safe, such as looking at or modifying the view
-     * hierarchy.
-     *
-     * @param runnable The code to run on the main thread.
-     */
-    public static void runOnMainSync(Runnable runnable) {
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            runnable.run();
-        } else {
-            Future<?> temp = MainThreadExecutor.getInstance().submit(runnable);
-            try {
-                temp.get();
-            } catch (InterruptedException | ExecutionException e) {
-                throw new RuntimeException(e);
-            }
-        }
-    }
-
     private static long getSeed() {
         // Set random seed as the date to track failed test data easily.
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd", Locale.getDefault());
@@ -131,4 +107,16 @@ public final class Utils {
     }
 
     private Utils() {}
+
+    /**
+     * Checks whether TvActivity is enabled or not.
+     */
+    public static boolean isTvActivityEnabled(Context context) {
+        PackageManager pm = context.getPackageManager();
+        ComponentName name = new ComponentName("com.android.tv",
+                "com.android.tv.TvActivity");
+        int enabled = pm.getComponentEnabledSetting(name);
+        return enabled == PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                || enabled == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
+    }
 }
diff --git a/tests/common/src/com/android/tv/testing/dvr/RecordingTestUtils.java b/tests/common/src/com/android/tv/testing/dvr/RecordingTestUtils.java
index b9def95e..a9bfa97a 100644
--- a/tests/common/src/com/android/tv/testing/dvr/RecordingTestUtils.java
+++ b/tests/common/src/com/android/tv/testing/dvr/RecordingTestUtils.java
@@ -16,7 +16,7 @@
 
 package com.android.tv.testing.dvr;
 
-import com.android.tv.dvr.ScheduledRecording;
+import com.android.tv.dvr.data.ScheduledRecording;
 
 import junit.framework.Assert;
 
diff --git a/tests/common/src/com/android/tv/testing/uihelper/Constants.java b/tests/common/src/com/android/tv/testing/uihelper/Constants.java
index 8f607fbf..8dd8e14a 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/Constants.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/Constants.java
@@ -23,6 +23,7 @@ public final class Constants {
     public static final double EXTRA_TIMEOUT_PERCENT = .05;
     public static final int MIN_EXTRA_TIMEOUT = 10;
     public static final long MAX_SHOW_DELAY_MILLIS = 200;
+    public static final long MAX_FOCUSED_DELAY_MILLIS = 1000;
     public static final String TV_APP_PACKAGE = "com.android.tv";
     public static final BySelector TV_VIEW = By.res(TV_APP_PACKAGE, "main_tunable_tv_view");
     public static final BySelector CHANNEL_BANNER = By.res(TV_APP_PACKAGE, "channel_banner_view");
@@ -30,6 +31,8 @@ public final class Constants {
     public static final BySelector MENU = By.res(TV_APP_PACKAGE, "menu");
     public static final BySelector SIDE_PANEL = By.res(TV_APP_PACKAGE, "side_panel");
     public static final BySelector PROGRAM_GUIDE = By.res(TV_APP_PACKAGE, "program_guide");
+    public static final BySelector DVR_LIBRARY = By.res(TV_APP_PACKAGE, "dvr_frame");
+    public static final BySelector DVR_SCHEDULES = By.res(TV_APP_PACKAGE, "dvr_schedules");
     public static final BySelector FOCUSED_VIEW = By.focused(true);
 
     private Constants() {
diff --git a/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java b/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java
index 6757cf01..1dc0f020 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java
@@ -1,6 +1,7 @@
 package com.android.tv.testing.uihelper;
 
 import static com.android.tv.testing.uihelper.UiDeviceAsserts.waitForCondition;
+import static junit.framework.TestCase.assertTrue;
 
 import android.content.Context;
 import android.content.Intent;
@@ -11,6 +12,8 @@ import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.Until;
 import android.util.Log;
 
+import com.android.tv.testing.Utils;
+
 import junit.framework.Assert;
 
 /**
@@ -29,6 +32,7 @@ public class LiveChannelsUiDeviceHelper extends BaseUiDeviceHelper {
     }
 
     public void assertAppStarted() {
+        assertTrue("TvActivity should be enabled.", Utils.isTvActivityEnabled(mContext));
         Intent intent = mContext.getPackageManager()
                 .getLaunchIntentForPackage(Constants.TV_APP_PACKAGE);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);    // Clear out any previous instances
@@ -48,4 +52,11 @@ public class LiveChannelsUiDeviceHelper extends BaseUiDeviceHelper {
             mUiDevice.pressBack();
         }
     }
+
+    public void assertAppStopped() {
+        while(mUiDevice.hasObject(By.pkg(Constants.TV_APP_PACKAGE).depth(0))) {
+            mUiDevice.pressBack();
+            mUiDevice.waitForIdle();
+        }
+    }
 }
\ No newline at end of file
diff --git a/tests/common/src/com/android/tv/testing/uihelper/MenuHelper.java b/tests/common/src/com/android/tv/testing/uihelper/MenuHelper.java
index ea5360a3..80d53242 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/MenuHelper.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/MenuHelper.java
@@ -139,6 +139,11 @@ public class MenuHelper extends BaseUiDeviceHelper {
                 R.string.channels_item_program_guide);
     }
 
+    public UiObject2 assertPressDvrLibrary() {
+        return assertPressMenuItem(R.string.menu_title_channels,
+                R.string.channels_item_dvr);
+    }
+
     /**
      * Navigate to the menu item with the text {@code itemTextResId} in the row with text
      * {@code rowTitleResId}.
@@ -171,7 +176,11 @@ public class MenuHelper extends BaseUiDeviceHelper {
     public void showMenu() {
         if (!mUiDevice.hasObject(MENU)) {
             mUiDevice.pressMenu();
-            UiDeviceAsserts.assertWaitForCondition(mUiDevice, Until.hasObject(MENU));
+            if (!UiDeviceAsserts.waitForCondition(mUiDevice, Until.hasObject(MENU))) {
+                // Sometimes animations might block menu key, try again to make sure it's received.
+                mUiDevice.pressMenu();
+                UiDeviceAsserts.assertWaitForCondition(mUiDevice, Until.hasObject(MENU));
+            }
         }
     }
 }
diff --git a/tests/common/src/com/android/tv/testing/uihelper/SidePanelHelper.java b/tests/common/src/com/android/tv/testing/uihelper/SidePanelHelper.java
index 2d4f9b2f..98a19a41 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/SidePanelHelper.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/SidePanelHelper.java
@@ -47,17 +47,23 @@ public class SidePanelHelper extends BaseUiDeviceHelper {
     }
 
     public UiObject2 assertNavigateToItem(int resId) {
-        String title = mTargetResources.getString(resId);
-        return assertNavigateToItem(title);
+        return assertNavigateToItem(resId, Direction.DOWN);
     }
 
+    public UiObject2 assertNavigateToItem(int resId, Direction direction) {
+        String title = mTargetResources.getString(resId);
+        return assertNavigateToItem(title, direction);
+    }
     public UiObject2 assertNavigateToItem(String title) {
+        return assertNavigateToItem(title, Direction.DOWN);
+    }
+
+    public UiObject2 assertNavigateToItem(String title, Direction direction) {
         BySelector sidePanelSelector = ByResource.id(mTargetResources, R.id.side_panel_list);
         UiObject2 sidePanelList = mUiDevice.findObject(sidePanelSelector);
         Assert.assertNotNull(sidePanelSelector + " not found", sidePanelList);
 
-        return UiDeviceAsserts
-                .assertNavigateTo(mUiDevice, sidePanelList, By.hasDescendant(By.text(title)),
-                        Direction.DOWN);
+        return UiDeviceAsserts.assertNavigateTo(mUiDevice, sidePanelList,
+                By.hasDescendant(By.text(title)), direction);
     }
 }
diff --git a/tests/common/src/com/android/tv/testing/uihelper/UiDeviceAsserts.java b/tests/common/src/com/android/tv/testing/uihelper/UiDeviceAsserts.java
index ea9b5460..c096d7d2 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/UiDeviceAsserts.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/UiDeviceAsserts.java
@@ -17,6 +17,7 @@ package com.android.tv.testing.uihelper;
 
 import static com.android.tv.testing.uihelper.Constants.FOCUSED_VIEW;
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertTrue;
 
 import android.support.test.uiautomator.By;
@@ -38,6 +39,12 @@ public final class UiDeviceAsserts {
         assertEquals("Has " + bySelector, expected, uiDevice.hasObject(bySelector));
     }
 
+    public static void assertWaitUntilFocused(UiDevice uiDevice, BySelector bySelector) {
+        UiObject2 uiObject = uiDevice.findObject(bySelector);
+        assertNotNull(uiObject);
+        assertTrue(uiObject.wait(Until.focused(true), Constants.MAX_FOCUSED_DELAY_MILLIS));
+    }
+
     /**
      * Assert that {@code searchCondition} becomes true within
      * {@value Constants#MAX_SHOW_DELAY_MILLIS} milliseconds.
diff --git a/tests/common/src/com/android/tv/testing/uihelper/UiDeviceUtils.java b/tests/common/src/com/android/tv/testing/uihelper/UiDeviceUtils.java
index 577559c2..98eff906 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/UiDeviceUtils.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/UiDeviceUtils.java
@@ -15,8 +15,16 @@
  */
 package com.android.tv.testing.uihelper;
 
+import static junit.framework.Assert.assertTrue;
+
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.os.Build;
+import android.os.SystemClock;
+import android.support.test.uiautomator.Configurator;
 import android.support.test.uiautomator.Direction;
 import android.support.test.uiautomator.UiDevice;
+import android.view.InputDevice;
 import android.view.KeyEvent;
 
 /**
@@ -51,7 +59,7 @@ public final class UiDeviceUtils {
     }
 
     /**
-     * Parses the string and sends the corresponding individual key preses.
+     * Parses the string and sends the corresponding individual key presses.
      * <p>
      * <b>Note:</b> only handles 0-9, '.', and '-'.
      */
@@ -69,6 +77,59 @@ public final class UiDeviceUtils {
         }
     }
 
+    /**
+     * Sends the DPAD Center key presses with the {@code repeat} count.
+     * TODO: Remove instrumentation argument once migrated to JUnit4.
+     */
+    public static void pressDPadCenter(Instrumentation instrumentation, int repeat) {
+        pressKey(instrumentation, KeyEvent.KEYCODE_DPAD_CENTER, repeat);
+    }
+
+    private static void pressKey(Instrumentation instrumentation, int keyCode, int repeat) {
+        UiDevice.getInstance(instrumentation).waitForIdle();
+        for (int i = 0; i < repeat; ++i) {
+            assertPressKeyDown(instrumentation, keyCode, false);
+            if (i < repeat - 1) {
+                assertPressKeyUp(instrumentation, keyCode, false);
+            }
+        }
+        // Send last key event synchronously.
+        assertPressKeyUp(instrumentation, keyCode, true);
+    }
+
+    private static void assertPressKeyDown(Instrumentation instrumentation, int keyCode,
+            boolean sync) {
+        assertPressKey(instrumentation, KeyEvent.ACTION_DOWN, keyCode, sync);
+    }
+
+    private static void assertPressKeyUp(Instrumentation instrumentation, int keyCode,
+            boolean sync) {
+        assertPressKey(instrumentation, KeyEvent.ACTION_UP, keyCode, sync);
+    }
+
+    private static void assertPressKey(Instrumentation instrumentation, int action, int keyCode,
+            boolean sync) {
+        long eventTime = SystemClock.uptimeMillis();
+        KeyEvent event = new KeyEvent(eventTime, eventTime, action, keyCode, 0, 0, -1, 0, 0,
+                InputDevice.SOURCE_KEYBOARD);
+        assertTrue("Failed to inject key up event:" + event,
+                injectEvent(instrumentation, event, sync));
+    }
+
+    private static boolean injectEvent(Instrumentation instrumentation, KeyEvent event,
+            boolean sync) {
+        return getUiAutomation(instrumentation).injectInputEvent(event, sync);
+    }
+
+    private static UiAutomation getUiAutomation(Instrumentation instrumentation) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            int flags = Configurator.getInstance().getUiAutomationFlags();
+            return instrumentation.getUiAutomation(flags);
+        } else {
+            return instrumentation.getUiAutomation();
+        }
+    }
+
     private UiDeviceUtils() {
     }
 }
diff --git a/tests/func/Android.mk b/tests/func/Android.mk
index b0c5ad1c..e89ba25b 100644
--- a/tests/func/Android.mk
+++ b/tests/func/Android.mk
@@ -14,8 +14,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     tv-test-common \
     ub-uiautomator \
 
-LOCAL_JAVA_LIBRARIES := legacy-android-test
-
 LOCAL_INSTRUMENTATION_FOR := LiveTv
 
 LOCAL_SDK_VERSION := current
diff --git a/tests/func/OWNERS b/tests/func/OWNERS
new file mode 100644
index 00000000..4aa5fe52
--- /dev/null
+++ b/tests/func/OWNERS
@@ -0,0 +1,2 @@
+nchalko@google.com
+shubang@google.com
diff --git a/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java b/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java
index e4f612e3..cfa5eda7 100644
--- a/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java
+++ b/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java
@@ -23,6 +23,7 @@ import android.support.test.uiautomator.Until;
 
 import com.android.tv.R;
 import com.android.tv.testing.uihelper.ByResource;
+import com.android.tv.testing.uihelper.UiDeviceUtils;
 
 /**
  * Tests for channel sources.
@@ -60,8 +61,7 @@ public class ChannelSourcesTest extends LiveChannelsTestCase {
         assertWaitForCondition(mDevice, Until.hasObject(mBySettingsSidePanel));
 
         mSidePanelHelper.assertNavigateToItem(R.string.settings_channel_source_item_setup);
-        mDevice.pressDPadCenter();
-        mDevice.pressDPadCenter();
+        UiDeviceUtils.pressDPadCenter(getInstrumentation(), 2);
 
         assertWaitForCondition(mDevice,
                 Until.hasObject(ByResource.text(mTargetResources, R.string.setup_sources_text)));
diff --git a/tests/func/src/com/android/tv/tests/ui/LiveChannelsTestCase.java b/tests/func/src/com/android/tv/tests/ui/LiveChannelsTestCase.java
index 25c7909b..e306e6c6 100644
--- a/tests/func/src/com/android/tv/tests/ui/LiveChannelsTestCase.java
+++ b/tests/func/src/com/android/tv/tests/ui/LiveChannelsTestCase.java
@@ -73,6 +73,8 @@ public abstract class LiveChannelsTestCase extends InstrumentationTestCase {
                 .hasObject(Constants.PROGRAM_GUIDE)) {
             mDevice.pressBack();
         }
+        // To destroy the activity to make sure next test case's activity launch check works well.
+        mDevice.pressBack();
         super.tearDown();
     }
 
diff --git a/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java b/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java
index bbc7aa81..82c6a810 100644
--- a/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java
+++ b/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java
@@ -16,11 +16,11 @@
 
 package com.android.tv.tests.ui;
 
+import static com.android.tv.testing.uihelper.Constants.CHANNEL_BANNER;
 import static com.android.tv.testing.uihelper.Constants.FOCUSED_VIEW;
 import static com.android.tv.testing.uihelper.Constants.MENU;
 import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition;
 
-import android.support.test.filters.SdkSuppress;
 import android.support.test.filters.SmallTest;
 import android.support.test.uiautomator.BySelector;
 import android.support.test.uiautomator.UiObject2;
@@ -32,9 +32,8 @@ import com.android.tv.testing.testinput.TvTestInputConstants;
 import com.android.tv.testing.uihelper.DialogHelper;
 
 @SmallTest
-@SdkSuppress(minSdkVersion = 23)
 public class PlayControlsRowViewTest extends LiveChannelsTestCase {
-    private static final int BUTTON_INDEX_PLAY_PAUSE = 2;
+    private static final String BUTTON_ID_PLAY_PAUSE = "com.android.tv:id/play_pause";
 
     private BySelector mBySettingsSidePanel;
 
@@ -42,7 +41,9 @@ public class PlayControlsRowViewTest extends LiveChannelsTestCase {
     protected void setUp() throws Exception {
         super.setUp();
         mLiveChannelsHelper.assertAppStarted();
-        pressKeysForChannel(TvTestInputConstants.CH_1_DEFAULT_DONT_MODIFY);
+        pressKeysForChannel(TvTestInputConstants.CH_2);
+        // Wait until KeypadChannelSwitchView closes.
+        assertWaitForCondition(mDevice, Until.hasObject(CHANNEL_BANNER));
         // Tune to a new channel to ensure that the channel is changed.
         mDevice.pressDPadUp();
         getInstrumentation().waitForIdleSync();
@@ -56,7 +57,7 @@ public class PlayControlsRowViewTest extends LiveChannelsTestCase {
     public void testFocusedViewInNormalCase() {
         mMenuHelper.showMenu();
         mMenuHelper.assertNavigateToPlayControlsRow();
-        assertButtonHasFocus(BUTTON_INDEX_PLAY_PAUSE);
+        assertButtonHasFocus(BUTTON_ID_PLAY_PAUSE);
         mDevice.pressBack();
     }
 
@@ -69,49 +70,30 @@ public class PlayControlsRowViewTest extends LiveChannelsTestCase {
         // Fast forward button
         mDevice.pressKeyCode(KeyEvent.KEYCODE_MEDIA_FAST_FORWARD);
         mMenuHelper.assertWaitForMenu();
-        assertButtonHasFocus(BUTTON_INDEX_PLAY_PAUSE);
+        assertButtonHasFocus(BUTTON_ID_PLAY_PAUSE);
         mDevice.pressBack();
 
         // Next button
         mDevice.pressKeyCode(KeyEvent.KEYCODE_MEDIA_NEXT);
         mMenuHelper.assertWaitForMenu();
-        assertButtonHasFocus(BUTTON_INDEX_PLAY_PAUSE);
-        mDevice.pressBack();
-    }
-
-    /**
-     * Tests the case when the rewinding action is disabled.
-     * In this case, the button corresponding to the action is disabled, so play/pause button should
-     * have the focus.
-     */
-    public void testFocusedViewWithDisabledActionBackward() {
-        // Previous button
-        mDevice.pressKeyCode(KeyEvent.KEYCODE_MEDIA_PREVIOUS);
-        mMenuHelper.assertWaitForMenu();
-        assertButtonHasFocus(BUTTON_INDEX_PLAY_PAUSE);
-        mDevice.pressBack();
-
-        // Rewind button
-        mDevice.pressKeyCode(KeyEvent.KEYCODE_MEDIA_REWIND);
-        mMenuHelper.assertWaitForMenu();
-        assertButtonHasFocus(BUTTON_INDEX_PLAY_PAUSE);
+        assertButtonHasFocus(BUTTON_ID_PLAY_PAUSE);
         mDevice.pressBack();
     }
 
     public void testFocusedViewInMenu() {
         mMenuHelper.showMenu();
         mDevice.pressKeyCode(KeyEvent.KEYCODE_MEDIA_PLAY);
-        assertButtonHasFocus(BUTTON_INDEX_PLAY_PAUSE);
+        assertButtonHasFocus(BUTTON_ID_PLAY_PAUSE);
         mMenuHelper.assertNavigateToRow(R.string.menu_title_channels);
         mDevice.pressKeyCode(KeyEvent.KEYCODE_MEDIA_NEXT);
-        assertButtonHasFocus(BUTTON_INDEX_PLAY_PAUSE);
+        assertButtonHasFocus(BUTTON_ID_PLAY_PAUSE);
     }
 
     public void testKeepPausedWhileParentalControlChange() {
         // Pause the playback.
         mDevice.pressKeyCode(KeyEvent.KEYCODE_MEDIA_PAUSE);
         mMenuHelper.assertWaitForMenu();
-        assertButtonHasFocus(BUTTON_INDEX_PLAY_PAUSE);
+        assertButtonHasFocus(BUTTON_ID_PLAY_PAUSE);
         // Show parental controls fragment.
         mMenuHelper.assertPressOptionsSettings();
         assertWaitForCondition(mDevice, Until.hasObject(mBySettingsSidePanel));
@@ -130,14 +112,14 @@ public class PlayControlsRowViewTest extends LiveChannelsTestCase {
         mDevice.pressBack();
         // Return to the main menu.
         mMenuHelper.assertWaitForMenu();
-        assertButtonHasFocus(BUTTON_INDEX_PLAY_PAUSE);
+        assertButtonHasFocus(BUTTON_ID_PLAY_PAUSE);
     }
 
     public void testKeepPausedAfterVisitingHome() {
         // Pause the playback.
         mDevice.pressKeyCode(KeyEvent.KEYCODE_MEDIA_PAUSE);
         mMenuHelper.assertWaitForMenu();
-        assertButtonHasFocus(BUTTON_INDEX_PLAY_PAUSE);
+        assertButtonHasFocus(BUTTON_ID_PLAY_PAUSE);
         // Press HOME twice to visit the home screen and return to Live TV.
         mDevice.pressHome();
         // Wait until home screen is shown.
@@ -147,19 +129,15 @@ public class PlayControlsRowViewTest extends LiveChannelsTestCase {
         mDevice.waitForIdle();
         // Return to the main menu.
         mMenuHelper.assertWaitForMenu();
-        assertButtonHasFocus(BUTTON_INDEX_PLAY_PAUSE);
+        assertButtonHasFocus(BUTTON_ID_PLAY_PAUSE);
     }
 
-    private void assertButtonHasFocus(int expectedButtonIndex) {
+    private void assertButtonHasFocus(String buttonId) {
         UiObject2 menu = mDevice.findObject(MENU);
         UiObject2 focusedView = menu.findObject(FOCUSED_VIEW);
         assertNotNull("Play controls row doesn't have a focused child.", focusedView);
         UiObject2 focusedButtonGroup = focusedView.getParent();
         assertNotNull("The focused item should have parent", focusedButtonGroup);
-        UiObject2 controlBar = focusedButtonGroup.getParent();
-        assertNotNull("The focused item should have grandparent", controlBar);
-        assertTrue("The grandparent should have more than five children",
-                controlBar.getChildCount() >= 5);
-        assertEquals(controlBar.getChildren().get(expectedButtonIndex), focusedButtonGroup);
+        assertEquals(buttonId, focusedButtonGroup.getResourceName());
     }
 }
diff --git a/tests/func/src/com/android/tv/tests/ui/ProgramGuidePerformanceTest.java b/tests/func/src/com/android/tv/tests/ui/ProgramGuidePerformanceTest.java
deleted file mode 100644
index 95921df9..00000000
--- a/tests/func/src/com/android/tv/tests/ui/ProgramGuidePerformanceTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.tv.tests.ui;
-
-import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition;
-
-import android.os.SystemClock;
-import android.support.test.filters.LargeTest;
-import android.support.test.uiautomator.Until;
-import android.util.Log;
-
-import com.android.tv.R;
-import com.android.tv.testing.uihelper.Constants;
-
-/**
- * Tests for {@link com.android.tv.MainActivity}.
- */
-@LargeTest
-public class ProgramGuidePerformanceTest extends LiveChannelsTestCase {
-    private static final String TAG = "ProgramGuidePerformance";
-
-    public static final int SHOW_MENU_MAX_DURATION_MS = 1500;
-    public void testShowMenu() {
-        mLiveChannelsHelper.assertAppStarted();
-        mMenuHelper.showMenu();
-        mMenuHelper.assertNavigateToMenuItem(R.string.menu_title_channels,
-                R.string.channels_item_program_guide);
-        //TODO: build a simple performance framework like JankTest
-        long start = SystemClock.elapsedRealtime();
-        Log.v(TAG, "start " + start + " milliSeconds");
-        mDevice.pressDPadCenter();
-        assertWaitForCondition(mDevice, Until.hasObject(Constants.PROGRAM_GUIDE));
-        long end = SystemClock.elapsedRealtime();
-        Log.v(TAG, "end " + end + " milliSeconds");
-        long duration = end - start;
-        assertDuration("ShowMenu", SHOW_MENU_MAX_DURATION_MS, duration);
-        mDevice.pressBack();
-    }
-
-    private void assertDuration(String msg, long expectedMaxMilliSeconds, long actualMilliSeconds) {
-        Log.d(TAG, msg + " duration " + actualMilliSeconds + " milliSeconds");
-        assertTrue(msg + " duration expected to be <= " + expectedMaxMilliSeconds
-                + " milliSeconds but was " + actualMilliSeconds + " milliSeconds.",
-                actualMilliSeconds <= expectedMaxMilliSeconds);
-    }
-}
diff --git a/tests/func/src/com/android/tv/tests/ui/dvr/DvrLibraryTest.java b/tests/func/src/com/android/tv/tests/ui/dvr/DvrLibraryTest.java
new file mode 100644
index 00000000..d88e67ad
--- /dev/null
+++ b/tests/func/src/com/android/tv/tests/ui/dvr/DvrLibraryTest.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.tv.tests.ui.dvr;
+
+import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertHas;
+import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition;
+import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitUntilFocused;
+
+import android.os.Build;
+import android.support.test.filters.MediumTest;
+import android.support.test.filters.SdkSuppress;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.BySelector;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+
+import com.android.tv.R;
+import com.android.tv.testing.uihelper.ByResource;
+import com.android.tv.testing.uihelper.Constants;
+import com.android.tv.tests.ui.LiveChannelsTestCase;
+
+import java.util.regex.Pattern;
+
+@MediumTest
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
+public class DvrLibraryTest extends LiveChannelsTestCase {
+    private static final String PROGRAM_NAME_PREFIX = "Title(";
+
+    private BySelector mRecentRow;
+    private BySelector mScheduledRow;
+    private BySelector mSeriesRow;
+    private BySelector mFullScheduleCard;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mRecentRow = By.hasDescendant(ByResource.text(mTargetResources, R.string.dvr_main_recent));
+        mScheduledRow = By.hasDescendant(
+                ByResource.text(mTargetResources, R.string.dvr_main_scheduled));
+        mSeriesRow = By.hasDescendant(ByResource.text(mTargetResources, R.string.dvr_main_series));
+        mFullScheduleCard = By.focusable(true).hasDescendant(
+                ByResource.text(mTargetResources, R.string.dvr_full_schedule_card_view_title));
+        mLiveChannelsHelper.assertAppStarted();
+    }
+
+    public void testCancel() {
+        mMenuHelper.assertPressDvrLibrary();
+        assertWaitForCondition(mDevice, Until.hasObject(Constants.DVR_LIBRARY));
+        mDevice.pressBack();
+        assertWaitForCondition(mDevice, Until.gone(Constants.DVR_LIBRARY));
+        assertHas(mDevice, Constants.MENU, false);
+    }
+
+    public void testEmptyLibrary() {
+        mMenuHelper.assertPressDvrLibrary();
+        assertWaitForCondition(mDevice, Until.hasObject(Constants.DVR_LIBRARY));
+
+        // DVR Library is empty, only Scheduled row and Full schedule card should be displayed.
+        assertHas(mDevice, mRecentRow, false);
+        assertHas(mDevice, mScheduledRow, true);
+        assertHas(mDevice, mSeriesRow, false);
+
+        mDevice.pressDPadCenter();
+        assertWaitUntilFocused(mDevice, mFullScheduleCard);
+        mDevice.pressDPadCenter();
+        assertWaitForCondition(mDevice, Until.gone(Constants.DVR_LIBRARY));
+
+        // Empty schedules screen should be shown.
+        assertHas(mDevice, Constants.DVR_SCHEDULES, true);
+        assertHas(mDevice, ByResource.text(mTargetResources, R.string.dvr_schedules_empty_state),
+                true);
+
+        // Close the DVR library.
+        mDevice.pressBack();
+        assertWaitForCondition(mDevice, Until.hasObject(Constants.DVR_LIBRARY));
+        mDevice.pressBack();
+        assertWaitForCondition(mDevice, Until.gone(Constants.DVR_LIBRARY));
+    }
+
+    public void testScheduleRecordings() {
+        BySelector newScheduleCard = By.focusable(true).hasDescendant(
+                By.textStartsWith(PROGRAM_NAME_PREFIX)).hasDescendant(By.textEndsWith("today"));
+        BySelector seriesCardWithOneSchedule = By.focusable(true).hasDescendant(
+                By.textStartsWith(PROGRAM_NAME_PREFIX)).hasDescendant(By.text(mTargetResources
+                        .getQuantityString(R.plurals.dvr_count_scheduled_recordings, 1, 1)));
+        BySelector seriesCardWithOneRecordedProgram = By.focusable(true).hasDescendant(
+                By.textStartsWith(PROGRAM_NAME_PREFIX)).hasDescendant(By.text(mTargetResources
+                        .getQuantityString(R.plurals.dvr_count_new_recordings, 1, 1)));
+        Pattern watchButton = Pattern.compile("^" + mTargetResources
+                .getString(R.string.dvr_detail_watch).toUpperCase() + "\n.*$");
+
+        mMenuHelper.showMenu();
+        mMenuHelper.assertNavigateToPlayControlsRow();
+        mDevice.pressDPadRight();
+        mDevice.pressDPadCenter();
+        assertWaitForCondition(mDevice, Until.hasObject(
+                ByResource.text(mTargetResources, R.string.dvr_action_record_episode)));
+        mDevice.pressDPadCenter();
+        assertWaitForCondition(mDevice, Until.gone(
+                ByResource.text(mTargetResources, R.string.dvr_action_record_episode)));
+
+        mMenuHelper.assertPressDvrLibrary();
+        assertWaitForCondition(mDevice, Until.hasObject(Constants.DVR_LIBRARY));
+
+        // Schedule should be automatically added to the series.
+        assertHas(mDevice, mRecentRow, false);
+        assertHas(mDevice, mScheduledRow, true);
+        assertHas(mDevice, mSeriesRow, true);
+        String programName = mDevice.findObject(By.textStartsWith(PROGRAM_NAME_PREFIX)).getText();
+
+        // Move to scheduled row, there should be one new schedule and one full schedule card.
+        mDevice.pressDPadRight();
+        assertWaitUntilFocused(mDevice, newScheduleCard);
+        mDevice.pressDPadRight();
+        assertWaitUntilFocused(mDevice, mFullScheduleCard);
+
+        // Enters the full schedule, there should be one schedule in the full schedule.
+        mDevice.pressDPadCenter();
+        assertWaitForCondition(mDevice, Until.gone(Constants.DVR_LIBRARY));
+        assertHas(mDevice, Constants.DVR_SCHEDULES, true);
+        assertHas(mDevice, ByResource.text(mTargetResources, R.string.dvr_schedules_empty_state),
+                false);
+        assertHas(mDevice, By.textStartsWith(programName), true);
+
+        // Moves to the series card, clicks it, the detail page should be shown with "View schedule"
+        // button.
+        mDevice.pressBack();
+        assertWaitForCondition(mDevice, Until.hasObject(Constants.DVR_LIBRARY));
+        mDevice.pressDPadLeft();
+        assertWaitUntilFocused(mDevice, newScheduleCard);
+        mDevice.pressDPadDown();
+        assertWaitUntilFocused(mDevice, seriesCardWithOneSchedule);
+        mDevice.pressDPadCenter();
+        assertWaitForCondition(mDevice, Until.gone(Constants.DVR_LIBRARY));
+        assertHas(mDevice, By.text(mTargetResources
+                        .getString(R.string.dvr_detail_view_schedule).toUpperCase()), true);
+        assertHas(mDevice, By.text(watchButton), false);
+        assertHas(mDevice, By.text(mTargetResources
+                        .getString(R.string.dvr_detail_series_delete).toUpperCase()), false);
+
+        // Clicks the new schedule, the detail page should be shown with "Stop recording" button.
+        mDevice.pressBack();
+        assertWaitForCondition(mDevice, Until.hasObject(Constants.DVR_LIBRARY));
+        assertWaitUntilFocused(mDevice, seriesCardWithOneSchedule);
+        mDevice.pressDPadUp();
+        assertWaitUntilFocused(mDevice, newScheduleCard);
+        mDevice.pressDPadCenter();
+        assertWaitForCondition(mDevice, Until.gone(Constants.DVR_LIBRARY));
+        assertHas(mDevice, By.text(mTargetResources
+                .getString(R.string.dvr_detail_stop_recording).toUpperCase()), true);
+
+        // Stops the recording
+        mDevice.pressDPadCenter();
+        assertWaitForCondition(mDevice, Until.hasObject(
+                ByResource.text(mTargetResources, R.string.dvr_action_stop)));
+        mDevice.pressDPadCenter();
+        assertWaitForCondition(mDevice, Until.gone(
+                ByResource.text(mTargetResources, R.string.dvr_action_stop)));
+        assertWaitForCondition(mDevice, Until.hasObject(Constants.DVR_LIBRARY));
+        assertWaitUntilFocused(mDevice, mFullScheduleCard);
+
+        // Moves to series' detail page again, now it should have two more buttons
+        mDevice.pressDPadDown();
+        assertWaitUntilFocused(mDevice, seriesCardWithOneRecordedProgram);
+        mDevice.pressDPadCenter();
+        assertWaitForCondition(mDevice, Until.gone(Constants.DVR_LIBRARY));
+        assertHas(mDevice, By.text(watchButton), true);
+        assertHas(mDevice, By.text(mTargetResources
+                .getString(R.string.dvr_detail_view_schedule).toUpperCase()), true);
+        assertHas(mDevice, By.text(mTargetResources
+                .getString(R.string.dvr_detail_series_delete).toUpperCase()), true);
+
+        // Moves to the recent row and clicks the recent recorded program.
+        mDevice.pressBack();
+        assertWaitForCondition(mDevice, Until.hasObject(Constants.DVR_LIBRARY));
+        assertWaitUntilFocused(mDevice, seriesCardWithOneRecordedProgram);
+        mDevice.pressDPadUp();
+        assertWaitUntilFocused(mDevice, mFullScheduleCard);
+        mDevice.pressDPadUp();
+        assertWaitUntilFocused(mDevice, By.focusable(true).hasDescendant(By.text(programName)));
+        mDevice.pressDPadCenter();
+        assertWaitForCondition(mDevice, Until.gone(Constants.DVR_LIBRARY));
+        assertHas(mDevice, By.text(mTargetResources
+                .getString(R.string.dvr_detail_watch).toUpperCase()), true);
+        assertHas(mDevice, By.text(mTargetResources
+                .getString(R.string.dvr_detail_delete).toUpperCase()), true);
+
+        // Moves to the delete button and clicks to remove the recorded program.
+        mDevice.pressDPadRight();
+        assertWaitUntilFocused(mDevice, By.text(mTargetResources
+                .getString(R.string.dvr_detail_delete).toUpperCase()));
+        mDevice.pressDPadCenter();
+        assertWaitForCondition(mDevice, Until.hasObject(Constants.DVR_LIBRARY));
+        assertWaitUntilFocused(mDevice, mFullScheduleCard);
+
+        // DVR Library should be empty now.
+        assertHas(mDevice, mRecentRow, false);
+        assertHas(mDevice, mScheduledRow, true);
+        assertHas(mDevice, mSeriesRow, false);
+
+        // Close the DVR library.
+        mDevice.pressBack();
+        assertWaitForCondition(mDevice, Until.gone(Constants.DVR_LIBRARY));
+    }
+}
diff --git a/tests/func/src/com/android/tv/tests/ui/sidepanel/CustomizeChannelListFragmentTest.java b/tests/func/src/com/android/tv/tests/ui/sidepanel/CustomizeChannelListFragmentTest.java
new file mode 100644
index 00000000..deeb9bfd
--- /dev/null
+++ b/tests/func/src/com/android/tv/tests/ui/sidepanel/CustomizeChannelListFragmentTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.tv.tests.ui.sidepanel;
+
+import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition;
+
+import android.graphics.Point;
+import android.support.test.filters.LargeTest;
+import android.support.test.uiautomator.BySelector;
+import android.support.test.uiautomator.Direction;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+
+import com.android.tv.R;
+import com.android.tv.testing.uihelper.Constants;
+import com.android.tv.tests.ui.LiveChannelsTestCase;
+
+@LargeTest
+public class CustomizeChannelListFragmentTest extends LiveChannelsTestCase {
+    private BySelector mBySettingsSidePanel;
+    private UiObject2 mTvView;
+    private Point mNormalTvViewCenter;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mLiveChannelsHelper.assertAppStarted();
+        mTvView = mDevice.findObject(Constants.TV_VIEW);
+        mNormalTvViewCenter = mTvView.getVisibleCenter();
+        assertNotNull(mNormalTvViewCenter);
+        pressKeysForChannel(com.android.tv.testing.testinput.TvTestInputConstants.CH_2);
+        // Wait until KeypadChannelSwitchView closes.
+        assertWaitForCondition(mDevice, Until.hasObject(Constants.CHANNEL_BANNER));
+        mBySettingsSidePanel = mSidePanelHelper.bySidePanelTitled(
+                R.string.side_panel_title_settings);
+    }
+
+    private void assertShrunkenTvView(boolean shrunkenExpected) {
+        Point currentTvViewCenter = mTvView.getVisibleCenter();
+        if (shrunkenExpected) {
+            assertFalse(mNormalTvViewCenter.equals(currentTvViewCenter));
+        } else {
+            assertTrue(mNormalTvViewCenter.equals(currentTvViewCenter));
+        }
+    }
+
+    public void testCustomizeChannelList_noraml() {
+        // Show customize channel list fragment
+        mMenuHelper.assertPressOptionsSettings();
+        assertWaitForCondition(mDevice, Until.hasObject(mBySettingsSidePanel));
+        mSidePanelHelper.assertNavigateToItem(
+                R.string.settings_channel_source_item_customize_channels);
+        mDevice.pressDPadCenter();
+        BySelector bySidePanel = mSidePanelHelper.bySidePanelTitled(
+                R.string.side_panel_title_edit_channels_for_an_input);
+        assertWaitForCondition(mDevice, Until.hasObject(bySidePanel));
+        assertShrunkenTvView(true);
+
+        // Show group by fragment
+        mSidePanelHelper.assertNavigateToItem(R.string.edit_channels_item_group_by, Direction.UP);
+        mDevice.pressDPadCenter();
+        bySidePanel = mSidePanelHelper.bySidePanelTitled(R.string.side_panel_title_group_by);
+        assertWaitForCondition(mDevice, Until.hasObject(bySidePanel));
+        assertShrunkenTvView(true);
+
+        // Back to customize channel list fragment
+        mDevice.pressBack();
+        bySidePanel = mSidePanelHelper.bySidePanelTitled(
+                R.string.side_panel_title_edit_channels_for_an_input);
+        assertWaitForCondition(mDevice, Until.hasObject(bySidePanel));
+        assertShrunkenTvView(true);
+
+        // Return to the main menu.
+        mDevice.pressBack();
+        assertWaitForCondition(mDevice, Until.hasObject(mBySettingsSidePanel));
+        assertShrunkenTvView(false);
+    }
+
+    public void testCustomizeChannelList_timeout() {
+        // Show customize channel list fragment
+        mMenuHelper.assertPressOptionsSettings();
+        assertWaitForCondition(mDevice, Until.hasObject(mBySettingsSidePanel));
+        mSidePanelHelper.assertNavigateToItem(
+                R.string.settings_channel_source_item_customize_channels);
+        mDevice.pressDPadCenter();
+        BySelector bySidePanel = mSidePanelHelper.bySidePanelTitled(
+                R.string.side_panel_title_edit_channels_for_an_input);
+        assertWaitForCondition(mDevice, Until.hasObject(bySidePanel));
+        assertShrunkenTvView(true);
+
+        // Show group by fragment
+        mSidePanelHelper.assertNavigateToItem(R.string.edit_channels_item_group_by, Direction.UP);
+        mDevice.pressDPadCenter();
+        bySidePanel = mSidePanelHelper.bySidePanelTitled(R.string.side_panel_title_group_by);
+        assertWaitForCondition(mDevice, Until.hasObject(bySidePanel));
+        assertShrunkenTvView(true);
+
+        // Wait for time-out to return to the main menu.
+        assertWaitForCondition(mDevice, Until.gone(bySidePanel),
+                mTargetResources.getInteger(R.integer.side_panel_show_duration));
+        assertShrunkenTvView(false);
+    }
+}
diff --git a/tests/input/OWNERS b/tests/input/OWNERS
new file mode 100644
index 00000000..4aa5fe52
--- /dev/null
+++ b/tests/input/OWNERS
@@ -0,0 +1,2 @@
+nchalko@google.com
+shubang@google.com
diff --git a/tests/input/res/values/strings.xml b/tests/input/res/values/strings.xml
index 3f2ab3f7..4ef43955 100644
--- a/tests/input/res/values/strings.xml
+++ b/tests/input/res/values/strings.xml
@@ -15,7 +15,6 @@
   -->
 <resources>
     <string name="app_name" translatable="false">Test TV Inputs</string>
-    <string name="about_app" translatable="false">About TV Test Inputs</string>
     <string name="version" translatable="false">Version: %1$s</string>
     <string name="sample_tv_input" translatable="false">Test TV Input</string>
     <string name="simple_input_label" translatable="false">Test Input</string>
diff --git a/tests/input/src/com/android/tv/testinput/TestTvInputService.java b/tests/input/src/com/android/tv/testinput/TestTvInputService.java
index 659b341f..621ceacb 100644
--- a/tests/input/src/com/android/tv/testinput/TestTvInputService.java
+++ b/tests/input/src/com/android/tv/testinput/TestTvInputService.java
@@ -326,11 +326,16 @@ public class TestTvInputService extends TvInputService {
                     if (currentSurface != null) {
                         String now = new Date(mCurrentPositionMs).toString();
                         String name = currentChannel == null ? "Null" : currentChannel.name;
-                        Canvas c = currentSurface.lockCanvas(null);
-                        c.drawColor(0xFF888888);
-                        c.drawText(name, 100f, 200f, mTextPaint);
-                        c.drawText(now, 100f, 400f, mTextPaint);
-                        currentSurface.unlockCanvasAndPost(c);
+                        try {
+                            Canvas c = currentSurface.lockCanvas(null);
+                            c.drawColor(0xFF888888);
+                            c.drawText(name, 100f, 200f, mTextPaint);
+                            c.drawText(now, 100f, 400f, mTextPaint);
+                            // Assuming c.drawXXX will never fail.
+                            currentSurface.unlockCanvasAndPost(c);
+                        } catch (IllegalArgumentException e) {
+                            // The surface might have been abandoned. Ignore the exception.
+                        }
                         if (DEBUG) {
                             Log.v(TAG, "Post to canvas");
                         }
diff --git a/tests/input/src/com/android/tv/testinput/TestTvInputSetupActivity.java b/tests/input/src/com/android/tv/testinput/TestTvInputSetupActivity.java
index 732972cc..a793ac71 100644
--- a/tests/input/src/com/android/tv/testinput/TestTvInputSetupActivity.java
+++ b/tests/input/src/com/android/tv/testinput/TestTvInputSetupActivity.java
@@ -20,13 +20,10 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
-import android.content.ContentResolver;
-import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.media.tv.TvContract;
 import android.media.tv.TvInputInfo;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 
@@ -58,39 +55,27 @@ public class TestTvInputSetupActivity extends Activity {
 
     private void registerChannels(int channelCount) {
         TestTvInputSetupActivity context = this;
-        registerChannels(context, mInputId, false, channelCount);
+        registerChannels(context, mInputId, channelCount);
     }
 
-    public static void registerChannels(Context context, String inputId, boolean updateBrowsable,
-            int channelCount) {
+    public static void registerChannels(Context context, String inputId, int channelCount) {
         Log.i(TAG, "Registering " + channelCount + " channels");
         List<ChannelInfo> channels = new ArrayList<>();
         for (int i = 1; i <= channelCount; i++) {
             channels.add(ChannelInfo.create(context, i));
         }
         ChannelUtils.updateChannels(context, inputId, channels);
-        if (updateBrowsable) {
-            updateChannelsBrowsable(context.getContentResolver(), inputId);
-        }
 
         // Reload channels so we have the ids.
         Map<Long, ChannelInfo> channelIdToInfoMap =
                 ChannelUtils.queryChannelInfoMapForTvInput(context, inputId);
         for (Long channelId : channelIdToInfoMap.keySet()) {
-            // TODO: http://b/21705569 Create better program info for tests
             ProgramInfo programInfo = ProgramInfo.create();
             ProgramUtils.populatePrograms(context, TvContract.buildChannelUri(channelId),
                     programInfo);
         }
     }
 
-    private static void updateChannelsBrowsable(ContentResolver contentResolver, String inputId) {
-        Uri uri = TvContract.buildChannelsUriForInput(inputId);
-        ContentValues values = new ContentValues();
-        values.put(TvContract.Channels.COLUMN_BROWSABLE, 1);
-        contentResolver.update(uri, values, null, null);
-    }
-
     public static class MyAlertDialogFragment extends DialogFragment {
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
diff --git a/tests/input/src/com/android/tv/testinput/instrument/TestSetupInstrumentation.java b/tests/input/src/com/android/tv/testinput/instrument/TestSetupInstrumentation.java
index 379bce86..48e485c5 100644
--- a/tests/input/src/com/android/tv/testinput/instrument/TestSetupInstrumentation.java
+++ b/tests/input/src/com/android/tv/testinput/instrument/TestSetupInstrumentation.java
@@ -104,7 +104,7 @@ public class TestSetupInstrumentation extends Instrumentation {
                     throw new TestSetupException(
                             "Unknown " + TEST_SETUP_MODE_ARG + " of " + testSetupMode);
             }
-            TestTvInputSetupActivity.registerChannels(getContext(), mInputId, true, channelCount);
+            TestTvInputSetupActivity.registerChannels(getContext(), mInputId, channelCount);
         }
     }
 
diff --git a/tests/jank/Android.mk b/tests/jank/Android.mk
index 210a75ea..b71ea1b7 100644
--- a/tests/jank/Android.mk
+++ b/tests/jank/Android.mk
@@ -15,8 +15,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     ub-janktesthelper \
     ub-uiautomator \
 
-LOCAL_JAVA_LIBRARIES := legacy-android-test
-
 LOCAL_INSTRUMENTATION_FOR := LiveTv
 
 LOCAL_SDK_VERSION := current
diff --git a/tests/jank/OWNERS b/tests/jank/OWNERS
new file mode 100644
index 00000000..4aa5fe52
--- /dev/null
+++ b/tests/jank/OWNERS
@@ -0,0 +1,2 @@
+nchalko@google.com
+shubang@google.com
diff --git a/tests/jank/src/com/android/tv/tests/jank/ChannelZappingJankTest.java b/tests/jank/src/com/android/tv/tests/jank/ChannelZappingJankTest.java
index b0463e71..ef936e32 100644
--- a/tests/jank/src/com/android/tv/tests/jank/ChannelZappingJankTest.java
+++ b/tests/jank/src/com/android/tv/tests/jank/ChannelZappingJankTest.java
@@ -15,20 +15,15 @@
  */
 package com.android.tv.tests.jank;
 
-import android.content.res.Resources;
 import android.support.test.filters.MediumTest;
 import android.support.test.jank.GfxMonitor;
 import android.support.test.jank.JankTest;
-import android.support.test.jank.JankTestBase;
-import android.support.test.uiautomator.UiDevice;
-
-import com.android.tv.testing.uihelper.LiveChannelsUiDeviceHelper;
 
 /**
  * Jank tests for channel zapping.
  */
 @MediumTest
-public class ChannelZappingJankTest extends JankTestBase {
+public class ChannelZappingJankTest extends LiveChannelsTestCase {
     private static final String TAG = "ChannelZappingJankTest";
 
     private static final String STARTING_CHANNEL = "13";
@@ -45,16 +40,9 @@ public class ChannelZappingJankTest extends JankTestBase {
     private static final int EXPECTED_FRAMES = 100;
     private static final int WARM_UP_CHANNEL_ZAPPING_COUNT = 2;
 
-    private UiDevice mDevice;
-
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        Resources targetResources = getInstrumentation().getTargetContext().getResources();
-        LiveChannelsUiDeviceHelper liveChannelsHelper = new LiveChannelsUiDeviceHelper(mDevice,
-                targetResources, getInstrumentation().getContext());
-        liveChannelsHelper.assertAppStarted();
         Utils.pressKeysForChannelNumber(STARTING_CHANNEL, mDevice);
     }
 
diff --git a/tests/jank/src/com/android/tv/tests/jank/LiveChannelsTestCase.java b/tests/jank/src/com/android/tv/tests/jank/LiveChannelsTestCase.java
new file mode 100644
index 00000000..6de01036
--- /dev/null
+++ b/tests/jank/src/com/android/tv/tests/jank/LiveChannelsTestCase.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.tv.tests.jank;
+
+import android.content.res.Resources;
+import android.support.test.jank.JankTestBase;
+import android.support.test.uiautomator.UiDevice;
+
+import com.android.tv.testing.uihelper.LiveChannelsUiDeviceHelper;
+
+/**
+ * Base test case for LiveChannel jank tests.
+ */
+abstract class LiveChannelsTestCase extends JankTestBase {
+    protected UiDevice mDevice;
+    protected Resources mTargetResources;
+    protected LiveChannelsUiDeviceHelper mLiveChannelsHelper;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mDevice = UiDevice.getInstance(getInstrumentation());
+        mTargetResources = getInstrumentation().getTargetContext().getResources();
+        mLiveChannelsHelper = new LiveChannelsUiDeviceHelper(mDevice, mTargetResources,
+                getInstrumentation().getContext());
+        mLiveChannelsHelper.assertAppStarted();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        // Destroys the activity to make sure next test case's activity launch check works well.
+        mLiveChannelsHelper.assertAppStopped();
+        super.tearDown();
+    }
+}
diff --git a/tests/jank/src/com/android/tv/tests/jank/MenuJankTest.java b/tests/jank/src/com/android/tv/tests/jank/MenuJankTest.java
index 47ebea3b..411a0bb9 100644
--- a/tests/jank/src/com/android/tv/tests/jank/MenuJankTest.java
+++ b/tests/jank/src/com/android/tv/tests/jank/MenuJankTest.java
@@ -15,21 +15,17 @@
  */
 package com.android.tv.tests.jank;
 
-import android.content.res.Resources;
 import android.support.test.filters.MediumTest;
 import android.support.test.jank.GfxMonitor;
 import android.support.test.jank.JankTest;
-import android.support.test.jank.JankTestBase;
-import android.support.test.uiautomator.UiDevice;
 
-import com.android.tv.testing.uihelper.LiveChannelsUiDeviceHelper;
 import com.android.tv.testing.uihelper.MenuHelper;
 
 /**
  * Jank tests for the program guide.
  */
 @MediumTest
-public class MenuJankTest extends JankTestBase {
+public class MenuJankTest extends LiveChannelsTestCase {
     private static final String STARTING_CHANNEL = "1";
 
     /**
@@ -42,22 +38,12 @@ public class MenuJankTest extends JankTestBase {
      * @see <a href="http://go/janktesthelper-best-practices">Jank Test Helper Best Practices</a>
      */
     private static final int EXPECTED_FRAMES = 200;
-
-    protected UiDevice mDevice;
-
-    protected Resources mTargetResources;
     protected MenuHelper mMenuHelper;
-    protected LiveChannelsUiDeviceHelper mLiveChannelsHelper;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mTargetResources = getInstrumentation().getTargetContext().getResources();
         mMenuHelper = new MenuHelper(mDevice, mTargetResources);
-        mLiveChannelsHelper = new LiveChannelsUiDeviceHelper(mDevice, mTargetResources,
-                getInstrumentation().getContext());
-        mLiveChannelsHelper.assertAppStarted();
         Utils.pressKeysForChannelNumber(STARTING_CHANNEL, mDevice);
     }
 
diff --git a/tests/jank/src/com/android/tv/tests/jank/ProgramGuideJankTest.java b/tests/jank/src/com/android/tv/tests/jank/ProgramGuideJankTest.java
index 7d751c4c..d8860dd7 100644
--- a/tests/jank/src/com/android/tv/tests/jank/ProgramGuideJankTest.java
+++ b/tests/jank/src/com/android/tv/tests/jank/ProgramGuideJankTest.java
@@ -17,29 +17,21 @@ package com.android.tv.tests.jank;
 
 import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition;
 
-import android.content.res.Resources;
 import android.support.test.filters.MediumTest;
 import android.support.test.jank.GfxMonitor;
 import android.support.test.jank.JankTest;
-import android.support.test.jank.JankTestBase;
-import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.Until;
 
 import com.android.tv.R;
 import com.android.tv.testing.uihelper.ByResource;
 import com.android.tv.testing.uihelper.Constants;
-import com.android.tv.testing.uihelper.LiveChannelsUiDeviceHelper;
 import com.android.tv.testing.uihelper.MenuHelper;
-import com.android.tv.testing.uihelper.UiDeviceUtils;
 
 /**
  * Jank tests for the program guide.
  */
 @MediumTest
-public class ProgramGuideJankTest extends JankTestBase {
-    private static final boolean DEBUG = false;
-    private static final String TAG = "ProgramGuideJank";
-
+public class ProgramGuideJankTest extends LiveChannelsTestCase {
     private static final String STARTING_CHANNEL = "13";
 
     /**
@@ -53,20 +45,12 @@ public class ProgramGuideJankTest extends JankTestBase {
      */
     private static final int EXPECTED_FRAMES = 200;
 
-    private UiDevice mDevice;
-
-    private Resources mTargetResources;
     private MenuHelper mMenuHelper;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mTargetResources = getInstrumentation().getTargetContext().getResources();
         mMenuHelper = new MenuHelper(mDevice, mTargetResources);
-        LiveChannelsUiDeviceHelper liveChannelsHelper = new LiveChannelsUiDeviceHelper(mDevice,
-                mTargetResources, getInstrumentation().getContext());
-        liveChannelsHelper.assertAppStarted();
         Utils.pressKeysForChannelNumber(STARTING_CHANNEL, mDevice);
     }
 
@@ -83,7 +67,7 @@ public class ProgramGuideJankTest extends JankTestBase {
     }
 
     @JankTest(expectedFrames = EXPECTED_FRAMES,
-            beforeLoop = "showProgramGuide",
+            beforeLoop = "showAndFocusProgramGuide",
             afterLoop = "clearProgramGuide")
     @GfxMonitor(processName = Utils.LIVE_CHANNELS_PROCESS_NAME)
     public void testScrollDown() {
@@ -95,7 +79,7 @@ public class ProgramGuideJankTest extends JankTestBase {
     }
 
     @JankTest(expectedFrames = EXPECTED_FRAMES,
-            beforeLoop = "showProgramGuide",
+            beforeLoop = "showAndFocusProgramGuide",
             afterLoop = "clearProgramGuide")
     @GfxMonitor(processName = Utils.LIVE_CHANNELS_PROCESS_NAME)
     public void testScrollRight() {
@@ -128,11 +112,17 @@ public class ProgramGuideJankTest extends JankTestBase {
         assertWaitForCondition(mDevice, Until.gone(Constants.PROGRAM_GUIDE));
     }
 
-    // It's public to be used with @JankTest annotation.
     public void showProgramGuide() {
         selectProgramGuideMenuItem();
         mDevice.pressDPadCenter();
         assertWaitForCondition(mDevice, Until.hasObject(Constants.PROGRAM_GUIDE));
+    }
+
+    // It's public to be used with @JankTest annotation.
+    public void showAndFocusProgramGuide() {
+        selectProgramGuideMenuItem();
+        mDevice.pressDPadCenter();
+        assertWaitForCondition(mDevice, Until.hasObject(Constants.PROGRAM_GUIDE));
         // If the side panel grid is visible (and thus has focus), move right to clear it.
         if (mDevice.hasObject(
                 ByResource.id(mTargetResources, R.id.program_guide_side_panel_grid_view))) {
diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk
index f53220de..3632fe94 100644
--- a/tests/unit/Android.mk
+++ b/tests/unit/Android.mk
@@ -12,7 +12,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     mockito-target \
     tv-test-common \
 
-LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/../common/res
 
 LOCAL_PACKAGE_NAME := TVUnitTests
 
@@ -22,3 +23,4 @@ LOCAL_SDK_VERSION := system_current
 LOCAL_MIN_SDK_VERSION := 23  # M
 
 include $(BUILD_PACKAGE)
+
diff --git a/tests/unit/AndroidManifest.xml b/tests/unit/AndroidManifest.xml
index aebb3772..d073f8ac 100644
--- a/tests/unit/AndroidManifest.xml
+++ b/tests/unit/AndroidManifest.xml
@@ -18,7 +18,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.tv.tests" >
 
-    <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="21" />
+    <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="23" />
 
     <instrumentation
         android:name="android.support.test.runner.AndroidJUnitRunner"
diff --git a/tests/unit/OWNERS b/tests/unit/OWNERS
new file mode 100644
index 00000000..4aa5fe52
--- /dev/null
+++ b/tests/unit/OWNERS
@@ -0,0 +1,2 @@
+nchalko@google.com
+shubang@google.com
diff --git a/tests/unit/src/com/android/tv/BaseMainActivityTestCase.java b/tests/unit/src/com/android/tv/BaseMainActivityTestCase.java
index e2f620ed..e6f1af7e 100644
--- a/tests/unit/src/com/android/tv/BaseMainActivityTestCase.java
+++ b/tests/unit/src/com/android/tv/BaseMainActivityTestCase.java
@@ -15,9 +15,11 @@
  */
 package com.android.tv;
 
+import static android.support.test.InstrumentationRegistry.getInstrumentation;
+
 import android.content.Context;
 import android.os.SystemClock;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.rule.ActivityTestRule;
 import android.text.TextUtils;
 
 import com.android.tv.data.Channel;
@@ -28,41 +30,40 @@ import com.android.tv.testing.testinput.TestInputControlConnection;
 import com.android.tv.testing.testinput.TestInputControlUtils;
 import com.android.tv.testing.testinput.TvTestInputConstants;
 
+import org.junit.Before;
+import org.junit.Rule;
+
 import java.util.List;
 
 /**
  * Base TestCase for tests that need a {@link MainActivity}.
  */
-public abstract class BaseMainActivityTestCase
-        extends ActivityInstrumentationTestCase2<MainActivity> {
+public abstract class BaseMainActivityTestCase {
     private static final String TAG = "BaseMainActivityTest";
     private static final int CHANNEL_LOADING_CHECK_INTERVAL_MS = 10;
 
+    @Rule
+    public ActivityTestRule<MainActivity> mActivityTestRule =
+            new ActivityTestRule<>(MainActivity.class);
+
     protected final TestInputControlConnection mConnection = new TestInputControlConnection();
 
     protected MainActivity mActivity;
 
-    public BaseMainActivityTestCase(Class<MainActivity> activityClass) {
-        super(activityClass);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
+        mActivity = mActivityTestRule.getActivity();
         // TODO: ensure the SampleInputs are setup.
-        setActivityInitialTouchMode(false);
-        mActivity = getActivity();
-        getInstrumentation().getContext()
+        getInstrumentation().getTargetContext()
                 .bindService(TestInputControlUtils.createIntent(), mConnection,
                         Context.BIND_AUTO_CREATE);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @Before
+    public void tearDown() {
         if (mConnection.isBound()) {
-            getInstrumentation().getContext().unbindService(mConnection);
+            getInstrumentation().getTargetContext().unbindService(mConnection);
         }
-        super.tearDown();
     }
 
     /**
@@ -72,16 +73,12 @@ public abstract class BaseMainActivityTestCase
      */
     protected void tuneToChannel(final Channel channel) {
         // Run on UI thread so views can be modified
-        try {
-            runTestOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    mActivity.tuneToChannel(channel);
-                }
-            });
-        } catch (Throwable throwable) {
-            throw new RuntimeException(throwable);
-        }
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                mActivity.tuneToChannel(channel);
+            }
+        });
     }
 
     /**
@@ -130,13 +127,17 @@ public abstract class BaseMainActivityTestCase
 
     private Channel findChannelWithName(String displayName) {
         waitUntilChannelLoadingFinish();
-        List<Channel> channelList = mActivity.getChannelDataManager().getChannelList();
+        Channel channel = null;
+        List <Channel> channelList = mActivity.getChannelDataManager().getChannelList();
         for (Channel c : channelList) {
             if (TextUtils.equals(c.getDisplayName(), displayName)) {
-                return c;
+                channel = c;
+                break;
             }
         }
-        throw new AssertionError("'" + displayName + "' channel not found");
+        if (channel == null) {
+            throw new AssertionError("'" + displayName + "' channel not found");
+        }
+        return channel;
     }
-
 }
diff --git a/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java b/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java
index 899083f3..f2917181 100644
--- a/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java
+++ b/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java
@@ -18,33 +18,37 @@ package com.android.tv;
 
 import static com.android.tv.TimeShiftManager.INVALID_TIME;
 import static com.android.tv.TimeShiftManager.REQUEST_TIMEOUT_MS;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
 
+import android.support.test.annotation.UiThreadTest;
 import android.support.test.filters.MediumTest;
-import android.test.UiThreadTest;
+
+import org.junit.Before;
+import org.junit.Test;
 
 @MediumTest
 public class CurrentPositionMediatorTest extends BaseMainActivityTestCase {
     private TimeShiftManager.CurrentPositionMediator mMediator;
 
-    public CurrentPositionMediatorTest() {
-        super(MainActivity.class);
-    }
-
     @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() {
         super.setUp();
         mMediator = mActivity.getTimeShiftManager().mCurrentPositionMediator;
     }
 
     @UiThreadTest
-    public void testInitialize() throws Throwable {
+    @Test
+    public void testInitialize() {
         long currentTimeMs = System.currentTimeMillis();
         mMediator.initialize(currentTimeMs);
         assertCurrentPositionMediator(INVALID_TIME, currentTimeMs);
     }
 
     @UiThreadTest
-    public void testOnSeekRequested() throws Throwable {
+    @Test
+    public void testOnSeekRequested() {
         long seekToTimeMs = System.currentTimeMillis() - REQUEST_TIMEOUT_MS * 3;
         mMediator.onSeekRequested(seekToTimeMs);
         assertNotSame("Seek request time", INVALID_TIME, mMediator.mSeekRequestTimeMs);
@@ -52,7 +56,8 @@ public class CurrentPositionMediatorTest extends BaseMainActivityTestCase {
     }
 
     @UiThreadTest
-    public void testOnCurrentPositionChangedInvalidInput() throws Throwable {
+    @Test
+    public void testOnCurrentPositionChangedInvalidInput() {
         long seekToTimeMs = System.currentTimeMillis() - REQUEST_TIMEOUT_MS * 3;
         long newCurrentTimeMs = seekToTimeMs + REQUEST_TIMEOUT_MS;
         mMediator.onSeekRequested(seekToTimeMs);
@@ -63,7 +68,8 @@ public class CurrentPositionMediatorTest extends BaseMainActivityTestCase {
     }
 
     @UiThreadTest
-    public void testOnCurrentPositionChangedValidInput() throws Throwable {
+    @Test
+    public void testOnCurrentPositionChangedValidInput() {
         long seekToTimeMs = System.currentTimeMillis() - REQUEST_TIMEOUT_MS * 3;
         long newCurrentTimeMs = seekToTimeMs + REQUEST_TIMEOUT_MS - 1;
         mMediator.onSeekRequested(seekToTimeMs);
diff --git a/tests/unit/src/com/android/tv/FeaturesTest.java b/tests/unit/src/com/android/tv/FeaturesTest.java
index 644c4248..9d61e757 100644
--- a/tests/unit/src/com/android/tv/FeaturesTest.java
+++ b/tests/unit/src/com/android/tv/FeaturesTest.java
@@ -16,19 +16,21 @@
 
 package com.android.tv;
 
+import static org.junit.Assert.assertFalse;
+
 import android.support.test.filters.SmallTest;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 /**
  * Test for features.
  */
 @SmallTest
-public class FeaturesTest extends TestCase {
-
+public class FeaturesTest {
+    @Test
     public void testPropertyFeatureKeyLength() {
         // This forces the class to be loaded and verifies all PropertyFeature key lengths.
         // If any keys are too long the test will fail to load.
-        assertEquals(false, Features.TEST_FEATURE.isEnabled(null));
+        assertFalse(Features.TEST_FEATURE.isEnabled(null));
     }
 }
diff --git a/tests/unit/src/com/android/tv/MainActivityTest.java b/tests/unit/src/com/android/tv/MainActivityTest.java
index b2fe6745..15805032 100644
--- a/tests/unit/src/com/android/tv/MainActivityTest.java
+++ b/tests/unit/src/com/android/tv/MainActivityTest.java
@@ -15,6 +15,10 @@
  */
 package com.android.tv;
 
+import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import android.support.test.filters.MediumTest;
 import android.view.View;
 import android.widget.TextView;
@@ -23,6 +27,8 @@ import com.android.tv.data.Channel;
 import com.android.tv.testing.testinput.TvTestInputConstants;
 import com.android.tv.ui.ChannelBannerView;
 
+import org.junit.Test;
+
 import java.util.List;
 
 /**
@@ -30,25 +36,22 @@ import java.util.List;
  */
 @MediumTest
 public class MainActivityTest extends BaseMainActivityTestCase {
-
-    public MainActivityTest() {
-        super(MainActivity.class);
-    }
-
+    @Test
     public void testInitialConditions() {
         waitUntilChannelLoadingFinish();
         List<Channel> channelList = mActivity.getChannelDataManager().getChannelList();
         assertTrue("Expected at least one channel", channelList.size() > 0);
-        assertFalse("PIP disabled", mActivity.isPipEnabled());
     }
 
-    public void testTuneToChannel() throws Throwable {
+    @Test
+    public void testTuneToChannel() {
         tuneToChannel(TvTestInputConstants.CH_2);
         assertChannelBannerShown(true);
         assertChannelName(TvTestInputConstants.CH_2.name);
     }
 
-    public void testShowProgramGuide() throws Throwable {
+    @Test
+    public void testShowProgramGuide() {
         tuneToChannel(TvTestInputConstants.CH_2);
         showProgramGuide();
         getInstrumentation().waitForIdleSync();
@@ -56,7 +59,7 @@ public class MainActivityTest extends BaseMainActivityTestCase {
         assertProgramGuide(true);
     }
 
-    private void showProgramGuide() throws Throwable {
+    private void showProgramGuide() {
         // Run on UI thread so views can be modified
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
@@ -81,7 +84,7 @@ public class MainActivityTest extends BaseMainActivityTestCase {
     }
 
     private View assertExpectedBannerSceneClassShown(Class<ChannelBannerView> expectedClass,
-            boolean expectedShown) throws AssertionError {
+            boolean expectedShown) {
         View v = assertViewIsShown(expectedClass.getSimpleName(), R.id.scene_transition_common,
                 expectedShown);
         if (v != null) {
@@ -90,8 +93,7 @@ public class MainActivityTest extends BaseMainActivityTestCase {
         return v;
     }
 
-    private View assertViewIsShown(String viewName, int viewId, boolean expected)
-            throws AssertionError {
+    private View assertViewIsShown(String viewName, int viewId, boolean expected) {
         View view = mActivity.findViewById(viewId);
         if (view == null) {
             if (expected) {
@@ -103,5 +105,4 @@ public class MainActivityTest extends BaseMainActivityTestCase {
         assertEquals(viewName + " shown", expected, view.isShown());
         return view;
     }
-
 }
diff --git a/tests/unit/src/com/android/tv/TimeShiftManagerTest.java b/tests/unit/src/com/android/tv/TimeShiftManagerTest.java
index f7c6f622..052b5d19 100644
--- a/tests/unit/src/com/android/tv/TimeShiftManagerTest.java
+++ b/tests/unit/src/com/android/tv/TimeShiftManagerTest.java
@@ -22,23 +22,25 @@ import static com.android.tv.TimeShiftManager.TIME_SHIFT_ACTION_ID_JUMP_TO_PREVI
 import static com.android.tv.TimeShiftManager.TIME_SHIFT_ACTION_ID_PAUSE;
 import static com.android.tv.TimeShiftManager.TIME_SHIFT_ACTION_ID_PLAY;
 import static com.android.tv.TimeShiftManager.TIME_SHIFT_ACTION_ID_REWIND;
+import static org.junit.Assert.assertEquals;
 
 import android.support.test.filters.MediumTest;
 
+import org.junit.Before;
+import org.junit.Test;
+
 @MediumTest
 public class TimeShiftManagerTest extends BaseMainActivityTestCase {
     private TimeShiftManager mTimeShiftManager;
 
-    public TimeShiftManagerTest() {
-        super(MainActivity.class);
-    }
-
     @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() {
         super.setUp();
         mTimeShiftManager = mActivity.getTimeShiftManager();
     }
 
+    @Test
     public void testDisableActions() {
         enableAllActions(true);
         assertActionState(true, true, true, true, true, true);
@@ -56,6 +58,7 @@ public class TimeShiftManagerTest extends BaseMainActivityTestCase {
         assertActionState(false, false, false, false, false, false);
     }
 
+    @Test
     public void testEnableActions() {
         enableAllActions(false);
         assertActionState(false, false, false, false, false, false);
diff --git a/tests/unit/src/com/android/tv/common/TvContentRatingCacheTest.java b/tests/unit/src/com/android/tv/common/TvContentRatingCacheTest.java
deleted file mode 100644
index eadc50d5..00000000
--- a/tests/unit/src/com/android/tv/common/TvContentRatingCacheTest.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.tv.common;
-
-import android.content.ComponentCallbacks2;
-import android.media.tv.TvContentRating;
-import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
-
-import com.android.tv.testing.TvContentRatingConstants;
-import com.android.tv.util.Utils;
-
-/**
- * Test for {@link android.media.tv.TvContentRating} tests in {@link Utils}.
- */
-@SmallTest
-public class TvContentRatingCacheTest extends AndroidTestCase {
-
-    /**
-     * US_TV_MA and US_TV_Y7 in order
-     */
-    public static final String MA_AND_Y7 = TvContentRatingConstants.STRING_US_TV_MA + ","
-            + TvContentRatingConstants.STRING_US_TV_Y7_US_TV_FV;
-
-    /**
-     * US_TV_MA and US_TV_Y7 not in order
-     */
-    public static final String Y7_AND_MA = TvContentRatingConstants.STRING_US_TV_Y7_US_TV_FV + ","
-            + TvContentRatingConstants.STRING_US_TV_MA;
-    final TvContentRatingCache mCache = TvContentRatingCache.getInstance();
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mCache.performTrimMemory(ComponentCallbacks2.TRIM_MEMORY_COMPLETE);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mCache.performTrimMemory(ComponentCallbacks2.TRIM_MEMORY_COMPLETE);
-        super.tearDown();
-    }
-
-    public void testGetRatings_US_TV_MA() {
-        TvContentRating[] result = mCache.getRatings(TvContentRatingConstants.STRING_US_TV_MA);
-        MoreAsserts.assertEquals(asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_MA), result);
-    }
-
-    public void testGetRatings_US_TV_MA_same() {
-        TvContentRating[] first = mCache.getRatings(TvContentRatingConstants.STRING_US_TV_MA);
-        TvContentRating[] second = mCache.getRatings(TvContentRatingConstants.STRING_US_TV_MA);
-        assertSame(first, second);
-    }
-
-    public void testGetRatings_US_TV_MA_diffAfterClear() {
-        TvContentRating[] first = mCache.getRatings(TvContentRatingConstants.STRING_US_TV_MA);
-        mCache.performTrimMemory(ComponentCallbacks2.TRIM_MEMORY_COMPLETE);
-        TvContentRating[] second = mCache.getRatings(TvContentRatingConstants.STRING_US_TV_MA);
-        assertNotSame(first, second);
-    }
-
-    public void testGetRatings_TWO_orderDoesNotMatter() {
-        TvContentRating[] first = mCache.getRatings(MA_AND_Y7);
-        TvContentRating[] second = mCache.getRatings(Y7_AND_MA);
-        assertSame(first, second);
-    }
-
-    public void testContentRatingsToString_null() {
-        String result = TvContentRatingCache.contentRatingsToString(null);
-        assertEquals("ratings string", null, result);
-    }
-
-    public void testContentRatingsToString_none() {
-        String result = TvContentRatingCache.contentRatingsToString(asArray());
-        assertEquals("ratings string", null, result);
-    }
-
-    public void testContentRatingsToString_one() {
-        String result = TvContentRatingCache
-                .contentRatingsToString(asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_MA));
-        assertEquals("ratings string", TvContentRatingConstants.STRING_US_TV_MA, result);
-    }
-
-    public void testContentRatingsToString_twoInOrder() {
-        String result = TvContentRatingCache.contentRatingsToString(
-                asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_MA,
-                        TvContentRatingConstants.CONTENT_RATING_US_TV_Y7_US_TV_FV));
-        assertEquals("ratings string", MA_AND_Y7, result);
-    }
-
-    public void testContentRatingsToString_twoNotInOrder() {
-        String result = TvContentRatingCache.contentRatingsToString(asArray(
-                TvContentRatingConstants.CONTENT_RATING_US_TV_Y7_US_TV_FV,
-                TvContentRatingConstants.CONTENT_RATING_US_TV_MA));
-        assertEquals("ratings string", MA_AND_Y7, result);
-    }
-
-    public void testContentRatingsToString_double() {
-        String result = TvContentRatingCache.contentRatingsToString(asArray(
-                TvContentRatingConstants.CONTENT_RATING_US_TV_MA,
-                TvContentRatingConstants.CONTENT_RATING_US_TV_MA));
-        assertEquals("ratings string", TvContentRatingConstants.STRING_US_TV_MA, result);
-    }
-
-    public void testStringToContentRatings_null() {
-        assertNull(TvContentRatingCache.stringToContentRatings(null));
-    }
-
-    public void testStringToContentRatings_none() {
-        assertNull(TvContentRatingCache.stringToContentRatings(""));
-    }
-
-    public void testStringToContentRatings_bad() {
-        assertNull(TvContentRatingCache.stringToContentRatings("bad"));
-    }
-
-    public void testStringToContentRatings_oneGoodOneBad() {
-        TvContentRating[] results = TvContentRatingCache
-                .stringToContentRatings(TvContentRatingConstants.STRING_US_TV_Y7_US_TV_FV + ",bad");
-        MoreAsserts.assertEquals("ratings",
-                asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_Y7_US_TV_FV), results);
-    }
-
-    public void testStringToContentRatings_one() {
-        TvContentRating[] results = TvContentRatingCache
-                .stringToContentRatings(TvContentRatingConstants.STRING_US_TV_Y7_US_TV_FV);
-        MoreAsserts.assertEquals("ratings",
-                asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_Y7_US_TV_FV), results);
-    }
-
-    public void testStringToContentRatings_twoNotInOrder() {
-        TvContentRating[] results = TvContentRatingCache.stringToContentRatings(Y7_AND_MA);
-        MoreAsserts.assertEquals("ratings",
-                asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_MA,
-                        TvContentRatingConstants.CONTENT_RATING_US_TV_Y7_US_TV_FV), results);
-    }
-
-    public void testStringToContentRatings_twoInOrder() {
-        TvContentRating[] results = TvContentRatingCache.stringToContentRatings(MA_AND_Y7);
-        MoreAsserts.assertEquals("ratings",
-                asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_MA,
-                        TvContentRatingConstants.CONTENT_RATING_US_TV_Y7_US_TV_FV), results);
-    }
-
-    public void testStringToContentRatings_double() {
-        TvContentRating[] results = TvContentRatingCache.stringToContentRatings(
-                TvContentRatingConstants.STRING_US_TV_MA + ","
-                        + TvContentRatingConstants.STRING_US_TV_MA);
-        MoreAsserts
-                .assertEquals("ratings", asArray(TvContentRatingConstants.CONTENT_RATING_US_TV_MA),
-                        results);
-    }
-
-    private static TvContentRating[] asArray(TvContentRating... ratings) {
-        return ratings;
-    }
-}
diff --git a/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java b/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java
index 9f9ada1f..7a4a4982 100644
--- a/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java
+++ b/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java
@@ -16,6 +16,12 @@
 
 package com.android.tv.data;
 
+import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.content.ContentProvider;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -26,9 +32,7 @@ import android.media.tv.TvContract;
 import android.media.tv.TvContract.Channels;
 import android.net.Uri;
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
-import android.test.UiThreadTest;
 import android.test.mock.MockContentProvider;
 import android.test.mock.MockContentResolver;
 import android.test.mock.MockCursor;
@@ -38,9 +42,11 @@ import android.util.SparseArray;
 
 import com.android.tv.testing.ChannelInfo;
 import com.android.tv.testing.Constants;
-import com.android.tv.testing.Utils;
 import com.android.tv.util.TvInputManagerHelper;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 
@@ -57,14 +63,13 @@ import java.util.concurrent.TimeUnit;
  * Note that all the methods of {@link ChannelDataManager} should be called from the UI thread.
  */
 @SmallTest
-public class ChannelDataManagerTest extends AndroidTestCase {
+public class ChannelDataManagerTest {
     private static final boolean DEBUG = false;
     private static final String TAG = "ChannelDataManagerTest";
 
     // Wait time for expected success.
     private static final long WAIT_TIME_OUT_MS = 1000L;
     private static final String DUMMY_INPUT_ID = "dummy";
-    // TODO: Use Channels.COLUMN_BROWSABLE and Channels.COLUMN_LOCKED instead.
     private static final String COLUMN_BROWSABLE = "browsable";
     private static final String COLUMN_LOCKED = "locked";
 
@@ -73,51 +78,59 @@ public class ChannelDataManagerTest extends AndroidTestCase {
     private FakeContentResolver mContentResolver;
     private FakeContentProvider mContentProvider;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         assertTrue("More than 2 channels to test", Constants.UNIT_TEST_CHANNEL_COUNT > 2);
 
-        mContentProvider = new FakeContentProvider(getContext());
+        mContentProvider = new FakeContentProvider(getTargetContext());
         mContentResolver = new FakeContentResolver();
         mContentResolver.addProvider(TvContract.AUTHORITY, mContentProvider);
         mListener = new TestChannelDataManagerListener();
-        Utils.runOnMainSync(new Runnable() {
+        getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 TvInputManagerHelper mockHelper = Mockito.mock(TvInputManagerHelper.class);
                 Mockito.when(mockHelper.hasTvInputInfo(Matchers.anyString())).thenReturn(true);
-                mChannelDataManager = new ChannelDataManager(getContext(), mockHelper,
+                mChannelDataManager = new ChannelDataManager(getTargetContext(), mockHelper,
                         mContentResolver);
                 mChannelDataManager.addListener(mListener);
             }
         });
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        Utils.runOnMainSync(new Runnable() {
+    @After
+    public void tearDown() {
+        getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 mChannelDataManager.stop();
             }
         });
-        super.tearDown();
     }
 
-    private void startAndWaitForComplete() throws Exception {
-        mChannelDataManager.start();
+    private void startAndWaitForComplete() throws InterruptedException {
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                mChannelDataManager.start();
+            }
+        });
         assertTrue(mListener.loadFinishedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS));
     }
 
-    private void restart() throws Exception {
-        mChannelDataManager.stop();
-        mListener.reset();
+    private void restart() throws InterruptedException {
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                mChannelDataManager.stop();
+                mListener.reset();
+            }
+        });
         startAndWaitForComplete();
     }
 
-    @UiThreadTest
-    public void testIsDbLoadFinished() throws Exception {
+    @Test
+    public void testIsDbLoadFinished() throws InterruptedException {
         startAndWaitForComplete();
         assertTrue(mChannelDataManager.isDbLoadFinished());
     }
@@ -128,8 +141,8 @@ public class ChannelDataManagerTest extends AndroidTestCase {
      *   - {@link ChannelDataManager#getChannelList}
      *   - {@link ChannelDataManager#getChannel}
      */
-    @UiThreadTest
-    public void testGetChannels() throws Exception {
+    @Test
+    public void testGetChannels() throws InterruptedException {
         startAndWaitForComplete();
 
         // Test {@link ChannelDataManager#getChannelCount}
@@ -138,7 +151,7 @@ public class ChannelDataManagerTest extends AndroidTestCase {
         // Test {@link ChannelDataManager#getChannelList}
         List<ChannelInfo> channelInfoList = new ArrayList<>();
         for (int i = 1; i <= Constants.UNIT_TEST_CHANNEL_COUNT; i++) {
-            channelInfoList.add(ChannelInfo.create(getContext(), i));
+            channelInfoList.add(ChannelInfo.create(getTargetContext(), i));
         }
         List<Channel> channelList = mChannelDataManager.getChannelList();
         for (Channel channel : channelList) {
@@ -163,8 +176,8 @@ public class ChannelDataManagerTest extends AndroidTestCase {
     /**
      * Test for {@link ChannelDataManager#getChannelCount} when no channel is available.
      */
-    @UiThreadTest
-    public void testGetChannels_noChannels() throws Exception {
+    @Test
+    public void testGetChannels_noChannels() throws InterruptedException {
         mContentProvider.clear();
         startAndWaitForComplete();
         assertEquals(0, mChannelDataManager.getChannelCount());
@@ -175,12 +188,12 @@ public class ChannelDataManagerTest extends AndroidTestCase {
      *   - {@link ChannelDataManager#updateBrowsable}
      *   - {@link ChannelDataManager#applyUpdatedValuesToDb}
      */
-    @UiThreadTest
-    public void testBrowsable() throws Exception {
+    @Test
+    public void testBrowsable() throws InterruptedException {
         startAndWaitForComplete();
 
         // Test if all channels are browsable
-        List<Channel> channelList = new ArrayList<>(mChannelDataManager.getChannelList());
+        List<Channel> channelList = mChannelDataManager.getChannelList();
         List<Channel> browsableChannelList = mChannelDataManager.getBrowsableChannelList();
         for (Channel browsableChannel : browsableChannelList) {
             boolean found = channelList.remove(browsableChannel);
@@ -189,9 +202,10 @@ public class ChannelDataManagerTest extends AndroidTestCase {
         assertEquals(0, channelList.size());
 
         // Prepare for next tests.
+        channelList = mChannelDataManager.getChannelList();
         TestChannelDataManagerChannelListener channelListener =
                 new TestChannelDataManagerChannelListener();
-        Channel channel1 = mChannelDataManager.getChannelList().get(0);
+        Channel channel1 = channelList.get(0);
         mChannelDataManager.addChannelListener(channel1.getId(), channelListener);
 
         // Test {@link ChannelDataManager#updateBrowsable} & notification.
@@ -216,15 +230,16 @@ public class ChannelDataManagerTest extends AndroidTestCase {
      *   - {@link ChannelDataManager#updateBrowsable}
      *   - {@link ChannelDataManager#applyUpdatedValuesToDb}
      */
-    @UiThreadTest
-    public void testBrowsable_skipNotification() throws Exception {
+    @Test
+    public void testBrowsable_skipNotification() throws InterruptedException {
         startAndWaitForComplete();
 
+        List<Channel> channels = mChannelDataManager.getChannelList();
         // Prepare for next tests.
         TestChannelDataManagerChannelListener channelListener =
                 new TestChannelDataManagerChannelListener();
-        Channel channel1 = mChannelDataManager.getChannelList().get(0);
-        Channel channel2 = mChannelDataManager.getChannelList().get(1);
+        Channel channel1 = channels.get(0);
+        Channel channel2 = channels.get(1);
         mChannelDataManager.addChannelListener(channel1.getId(), channelListener);
         mChannelDataManager.addChannelListener(channel2.getId(), channelListener);
 
@@ -252,8 +267,8 @@ public class ChannelDataManagerTest extends AndroidTestCase {
      *   - {@link ChannelDataManager#updateLocked}
      *   - {@link ChannelDataManager#applyUpdatedValuesToDb}
      */
-    @UiThreadTest
-    public void testLocked() throws Exception {
+    @Test
+    public void testLocked() throws InterruptedException {
         startAndWaitForComplete();
 
         // Test if all channels aren't locked at the first time.
@@ -283,14 +298,14 @@ public class ChannelDataManagerTest extends AndroidTestCase {
     /**
      * Test ChannelDataManager when channels in TvContract are updated, removed, or added.
      */
-    @UiThreadTest
-    public void testChannelListChanged() throws Exception {
+    @Test
+    public void testChannelListChanged() throws InterruptedException {
         startAndWaitForComplete();
 
         // Test channel add.
         mListener.reset();
         long testChannelId = Constants.UNIT_TEST_CHANNEL_COUNT + 1;
-        ChannelInfo testChannelInfo = ChannelInfo.create(getContext(), (int) testChannelId);
+        ChannelInfo testChannelInfo = ChannelInfo.create(getTargetContext(), (int) testChannelId);
         testChannelId = Constants.UNIT_TEST_CHANNEL_COUNT + 1;
         mContentProvider.simulateInsert(testChannelInfo);
         assertTrue(
@@ -376,7 +391,7 @@ public class ChannelDataManagerTest extends AndroidTestCase {
             super(context);
             for (int i = 1; i <= Constants.UNIT_TEST_CHANNEL_COUNT; i++) {
                 mChannelInfoList.put(i,
-                        new ChannelInfoWrapper(ChannelInfo.create(getContext(), i)));
+                        new ChannelInfoWrapper(ChannelInfo.create(getTargetContext(), i)));
             }
         }
 
@@ -466,8 +481,8 @@ public class ChannelDataManagerTest extends AndroidTestCase {
          */
         public void simulateInsert(ChannelInfo testChannelInfo) {
             long channelId = testChannelInfo.originalNetworkId;
-            mChannelInfoList.put((int) channelId,
-                    new ChannelInfoWrapper(ChannelInfo.create(getContext(), (int) channelId)));
+            mChannelInfoList.put((int) channelId, new ChannelInfoWrapper(
+                    ChannelInfo.create(getTargetContext(), (int) channelId)));
             mContentResolver.notifyChange(TvContract.buildChannelUri(channelId), null);
         }
 
diff --git a/tests/unit/src/com/android/tv/data/ChannelNumberTest.java b/tests/unit/src/com/android/tv/data/ChannelNumberTest.java
index 4e6e9f3c..827dcdbd 100644
--- a/tests/unit/src/com/android/tv/data/ChannelNumberTest.java
+++ b/tests/unit/src/com/android/tv/data/ChannelNumberTest.java
@@ -16,22 +16,24 @@
 package com.android.tv.data;
 
 import static com.android.tv.data.ChannelNumber.parseChannelNumber;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import android.support.test.filters.SmallTest;
 
 import com.android.tv.testing.ComparableTester;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 /**
  * Tests for {@link ChannelNumber}.
  */
 @SmallTest
-public class ChannelNumberTest extends TestCase {
-
+public class ChannelNumberTest {
     /**
      * Test method for {@link ChannelNumber#ChannelNumber()}.
      */
+    @Test
     public void testChannelNumber() {
         assertChannelEquals(new ChannelNumber(), "", false, "");
     }
@@ -40,32 +42,32 @@ public class ChannelNumberTest extends TestCase {
      * Test method for
      * {@link com.android.tv.data.ChannelNumber#parseChannelNumber(java.lang.String)}.
      */
+    @Test
     public void testParseChannelNumber() {
         assertNull(parseChannelNumber(""));
-        assertNull(parseChannelNumber(" "));
+        assertNull(parseChannelNumber("-"));
         assertNull(parseChannelNumber("abcd12"));
         assertNull(parseChannelNumber("12abcd"));
         assertNull(parseChannelNumber("-12"));
         assertChannelEquals(parseChannelNumber("1"), "1", false, "");
-        assertChannelEquals(parseChannelNumber("1234 4321"), "1234", true, "4321");
+        assertChannelEquals(parseChannelNumber("1234-4321"), "1234", true, "4321");
         assertChannelEquals(parseChannelNumber("3-4"), "3", true, "4");
-        assertChannelEquals(parseChannelNumber("5.6"), "5", true, "6");
+        assertChannelEquals(parseChannelNumber("5-6"), "5", true, "6");
     }
 
     /**
      * Test method for {@link ChannelNumber#compareTo(com.android.tv.data.ChannelNumber)}.
      */
+    @Test
     public void testCompareTo() {
         new ComparableTester<ChannelNumber>()
                 .addEquivalentGroup(parseChannelNumber("1"), parseChannelNumber("1"))
                 .addEquivalentGroup(parseChannelNumber("2"))
-                .addEquivalentGroup(parseChannelNumber("2 1"), parseChannelNumber("2.1"),
-                        parseChannelNumber("2-1"))
+                .addEquivalentGroup(parseChannelNumber("2-1"))
                 .addEquivalentGroup(parseChannelNumber("2-2"))
                 .addEquivalentGroup(parseChannelNumber("2-10"))
                 .addEquivalentGroup(parseChannelNumber("3"))
-                .addEquivalentGroup(parseChannelNumber("4"), parseChannelNumber("4 0"),
-                        parseChannelNumber("4.0"), parseChannelNumber("4-0"))
+                .addEquivalentGroup(parseChannelNumber("4"), parseChannelNumber("4-0"))
                 .addEquivalentGroup(parseChannelNumber("10"))
                 .addEquivalentGroup(parseChannelNumber("100"))
                 .test();
@@ -74,6 +76,7 @@ public class ChannelNumberTest extends TestCase {
     /**
      * Test method for {@link ChannelNumber#compare(java.lang.String, java.lang.String)}.
      */
+    @Test
     public void testCompare() {
         // Only need to test nulls, the reset is tested by testCompareTo
         assertEquals("compareTo(null,null)", 0, ChannelNumber.compare(null, null));
diff --git a/tests/unit/src/com/android/tv/data/ChannelTest.java b/tests/unit/src/com/android/tv/data/ChannelTest.java
index 95e3ee90..d270e277 100644
--- a/tests/unit/src/com/android/tv/data/ChannelTest.java
+++ b/tests/unit/src/com/android/tv/data/ChannelTest.java
@@ -16,17 +16,21 @@
 
 package com.android.tv.data;
 
+import static org.junit.Assert.assertEquals;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 
 import com.android.tv.testing.ComparatorTester;
 import com.android.tv.util.TvInputManagerHelper;
 
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
@@ -38,7 +42,7 @@ import java.util.Comparator;
  * Tests for {@link Channel}.
  */
 @SmallTest
-public class ChannelTest extends AndroidTestCase {
+public class ChannelTest {
     // Used for testing TV inputs with invalid input package. This could happen when a TV input is
     // uninstalled while drawing an app link card.
     private static final String INVALID_TV_INPUT_PACKAGE_NAME =
@@ -59,9 +63,8 @@ public class ChannelTest extends AndroidTestCase {
     private Intent mInvalidIntent;
     private Intent mValidIntent;
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws NameNotFoundException {
         mInvalidIntent = new Intent(Intent.ACTION_VIEW);
         mInvalidIntent.setComponent(new ComponentName(INVALID_TV_INPUT_PACKAGE_NAME, ".test"));
         mValidIntent = new Intent(Intent.ACTION_VIEW);
@@ -103,6 +106,7 @@ public class ChannelTest extends AndroidTestCase {
         Mockito.when(mMockContext.getPackageManager()).thenReturn(mockPackageManager);
     }
 
+    @Test
     public void testGetAppLinkType_NoText_NoIntent() {
         assertAppLinkType(Channel.APP_LINK_TYPE_NONE, INVALID_TV_INPUT_PACKAGE_NAME, null, null);
         assertAppLinkType(Channel.APP_LINK_TYPE_NONE, LIVE_CHANNELS_PACKAGE_NAME, null, null);
@@ -226,7 +230,6 @@ public class ChannelTest extends AndroidTestCase {
      * See <a href="http://b/23031603">b/23031603</a>.
      */
     public void testComparatorLabel() {
-
         TvInputManagerHelper manager = Mockito.mock(TvInputManagerHelper.class);
         Mockito.when(manager.isPartnerInput(Matchers.anyString())).thenAnswer(
                 new Answer<Boolean>() {
@@ -254,6 +257,29 @@ public class ChannelTest extends AndroidTestCase {
         comparatorTester.test();
     }
 
+    public void testNormalizeChannelNumber() {
+        assertNormalizedDisplayNumber(null, null);
+        assertNormalizedDisplayNumber("", "");
+        assertNormalizedDisplayNumber("1", "1");
+        assertNormalizedDisplayNumber("abcde", "abcde");
+        assertNormalizedDisplayNumber("1-1", "1-1");
+        assertNormalizedDisplayNumber("1.1", "1-1");
+        assertNormalizedDisplayNumber("1 1", "1-1");
+        assertNormalizedDisplayNumber("1\u058a1", "1-1");
+        assertNormalizedDisplayNumber("1\u05be1", "1-1");
+        assertNormalizedDisplayNumber("1\u14001", "1-1");
+        assertNormalizedDisplayNumber("1\u18061", "1-1");
+        assertNormalizedDisplayNumber("1\u20101", "1-1");
+        assertNormalizedDisplayNumber("1\u20111", "1-1");
+        assertNormalizedDisplayNumber("1\u20121", "1-1");
+        assertNormalizedDisplayNumber("1\u20131", "1-1");
+        assertNormalizedDisplayNumber("1\u20141", "1-1");
+    }
+
+    private void assertNormalizedDisplayNumber(String displayNumber, String normalized) {
+        assertEquals(normalized, Channel.normalizeDisplayNumber(displayNumber));
+    }
+
     private class TestChannelComparator extends Channel.DefaultComparator {
         public TestChannelComparator(TvInputManagerHelper manager) {
             super(null, manager);
diff --git a/tests/unit/src/com/android/tv/data/GenreItemTest.java b/tests/unit/src/com/android/tv/data/GenreItemTest.java
index fb48fd41..fdbcb599 100644
--- a/tests/unit/src/com/android/tv/data/GenreItemTest.java
+++ b/tests/unit/src/com/android/tv/data/GenreItemTest.java
@@ -16,23 +16,32 @@
 
 package com.android.tv.data;
 
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import android.media.tv.TvContract.Programs.Genres;
 import android.os.Build;
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
+
+import org.junit.Test;
 
 /**
  * Tests for {@link Channel}.
  */
 @SmallTest
-public class GenreItemTest extends AndroidTestCase {
+public class GenreItemTest {
     private static final String INVALID_GENRE = "INVALID GENRE";
 
+    @Test
     public void testGetLabels() {
         // Checks if no exception is thrown.
-        GenreItems.getLabels(getContext());
+        GenreItems.getLabels(getTargetContext());
     }
 
+    @Test
     public void testGetCanonicalGenre() {
         int count = GenreItems.getGenreCount();
         assertNull(GenreItems.getCanonicalGenre(GenreItems.ID_ALL_CHANNELS));
@@ -41,6 +50,7 @@ public class GenreItemTest extends AndroidTestCase {
         }
     }
 
+    @Test
     public void testGetId_base() {
         int count = GenreItems.getGenreCount();
         assertEquals(GenreItems.ID_ALL_CHANNELS, GenreItems.getId(null));
@@ -58,6 +68,7 @@ public class GenreItemTest extends AndroidTestCase {
         assertInRange(GenreItems.getId(Genres.GAMING), 1, count - 1);
     }
 
+    @Test
     public void testGetId_lmp_mr1() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
             assertEquals(GenreItems.ID_ALL_CHANNELS, GenreItems.getId(Genres.ARTS));
diff --git a/tests/unit/src/com/android/tv/data/ProgramDataManagerTest.java b/tests/unit/src/com/android/tv/data/ProgramDataManagerTest.java
index 430eef91..5457051f 100644
--- a/tests/unit/src/com/android/tv/data/ProgramDataManagerTest.java
+++ b/tests/unit/src/com/android/tv/data/ProgramDataManagerTest.java
@@ -16,14 +16,20 @@
 
 package com.android.tv.data;
 
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import android.content.Context;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.media.tv.TvContract;
 import android.net.Uri;
 import android.os.HandlerThread;
+import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 import android.test.mock.MockContentProvider;
 import android.test.mock.MockContentResolver;
 import android.test.mock.MockCursor;
@@ -35,6 +41,10 @@ import com.android.tv.testing.FakeClock;
 import com.android.tv.testing.ProgramInfo;
 import com.android.tv.util.Utils;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -45,7 +55,7 @@ import java.util.concurrent.TimeUnit;
  * Test for {@link com.android.tv.data.ProgramDataManager}
  */
 @SmallTest
-public class ProgramDataManagerTest extends AndroidTestCase {
+public class ProgramDataManagerTest {
     private static final boolean DEBUG = false;
     private static final String TAG = "ProgramDataManagerTest";
 
@@ -66,31 +76,28 @@ public class ProgramDataManagerTest extends AndroidTestCase {
     private FakeContentResolver mContentResolver;
     private FakeContentProvider mContentProvider;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setUp() {
         mClock = FakeClock.createWithCurrentTime();
         mListener = new TestProgramDataManagerListener();
-        mContentProvider = new FakeContentProvider(getContext());
+        mContentProvider = new FakeContentProvider(getTargetContext());
         mContentResolver = new FakeContentResolver();
         mContentResolver.addProvider(TvContract.AUTHORITY, mContentProvider);
         mHandlerThread = new HandlerThread(TAG);
         mHandlerThread.start();
         mProgramDataManager = new ProgramDataManager(
-                mContentResolver, mClock, mHandlerThread.getLooper(), null);
+                mContentResolver, mClock, mHandlerThread.getLooper());
         mProgramDataManager.setPrefetchEnabled(true);
         mProgramDataManager.addListener(mListener);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
+    @After
+    public void tearDown() {
         mHandlerThread.quitSafely();
         mProgramDataManager.stop();
     }
 
-    private void startAndWaitForComplete() throws Exception {
+    private void startAndWaitForComplete() throws InterruptedException {
         mProgramDataManager.start();
         assertTrue(mListener.programUpdatedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS));
     }
@@ -98,12 +105,13 @@ public class ProgramDataManagerTest extends AndroidTestCase {
     /**
      * Test for {@link ProgramInfo#getIndex} and {@link ProgramInfo#getStartTimeMs}.
      */
+    @Test
     public void testProgramUtils() {
         ProgramInfo stub = ProgramInfo.create();
         for (long channelId = 1; channelId < Constants.UNIT_TEST_CHANNEL_COUNT; channelId++) {
             int index = stub.getIndex(mClock.currentTimeMillis(), channelId);
             long startTimeMs = stub.getStartTimeMs(index, channelId);
-            ProgramInfo programAt = stub.build(getContext(), index);
+            ProgramInfo programAt = stub.build(InstrumentationRegistry.getContext(), index);
             assertTrue(startTimeMs <= mClock.currentTimeMillis());
             assertTrue(mClock.currentTimeMillis() < startTimeMs + programAt.durationMs);
         }
@@ -118,7 +126,8 @@ public class ProgramDataManagerTest extends AndroidTestCase {
      * {@link ProgramDataManager#setPrefetchTimeRange(long)}.
      * </p>
      */
-    public void testGetPrograms() throws Exception {
+    @Test
+    public void testGetPrograms() throws InterruptedException {
         // Initial setup to test {@link ProgramDataManager#setPrefetchTimeRange(long)}.
         long preventSnapDelayMs = ProgramDataManager.PROGRAM_GUIDE_SNAP_TIME_MS * 2;
         long prefetchTimeRangeStartMs = System.currentTimeMillis() + preventSnapDelayMs;
@@ -140,7 +149,7 @@ public class ProgramDataManagerTest extends AndroidTestCase {
             ProgramInfo stub = ProgramInfo.create();
             int index = stub.getIndex(mClock.currentTimeMillis(), channelId);
             for (Program program : programs) {
-                ProgramInfo programInfoAt = stub.build(getContext(), index);
+                ProgramInfo programInfoAt = stub.build(InstrumentationRegistry.getContext(), index);
                 long startTimeMs = stub.getStartTimeMs(index, channelId);
                 assertProgramEquals(startTimeMs, programInfoAt, program);
                 index++;
@@ -167,14 +176,15 @@ public class ProgramDataManagerTest extends AndroidTestCase {
      * {@link ProgramDataManager#removeOnCurrentProgramUpdatedListener}.
      * </p>
      */
-    public void testCurrentProgramListener() throws Exception {
+    @Test
+    public void testCurrentProgramListener() throws InterruptedException {
         final long testChannelId = 1;
         ProgramInfo stub = ProgramInfo.create();
         int index = stub.getIndex(mClock.currentTimeMillis(), testChannelId);
         // Set current time to few seconds before the current program ends,
         // so we can see if callback is called as expected.
         long nextProgramStartTimeMs = stub.getStartTimeMs(index + 1, testChannelId);
-        ProgramInfo nextProgramInfo = stub.build(getContext(), index + 1);
+        ProgramInfo nextProgramInfo = stub.build(InstrumentationRegistry.getContext(), index + 1);
         mClock.setCurrentTimeMillis(nextProgramStartTimeMs - (WAIT_TIME_OUT_MS / 2));
 
         startAndWaitForComplete();
@@ -196,7 +206,8 @@ public class ProgramDataManagerTest extends AndroidTestCase {
     /**
      * Test if program data is refreshed after the program insertion.
      */
-    public void testContentProviderUpdate() throws Exception {
+    @Test
+    public void testContentProviderUpdate() throws InterruptedException {
         final long testChannelId = 1;
         startAndWaitForComplete();
         // Force program data manager to update program data whenever it's changes.
@@ -217,7 +228,8 @@ public class ProgramDataManagerTest extends AndroidTestCase {
     /**
      * Test for {@link ProgramDataManager#setPauseProgramUpdate(boolean)}.
      */
-    public void testSetPauseProgramUpdate() throws Exception {
+    @Test
+    public void testSetPauseProgramUpdate() throws InterruptedException {
         final long testChannelId = 1;
         startAndWaitForComplete();
         // Force program data manager to update program data whenever it's changes.
@@ -290,7 +302,7 @@ public class ProgramDataManagerTest extends AndroidTestCase {
                 int index = stub.getIndex(startTimeMs, i);
                 long programStartTimeMs = stub.getStartTimeMs(index, i);
                 while (programStartTimeMs < endTimeMs) {
-                    ProgramInfo programAt = stub.build(getContext(), index);
+                    ProgramInfo programAt = stub.build(InstrumentationRegistry.getContext(), index);
                     programInfoList.add(
                             new ProgramInfoWrapper(index, programStartTimeMs, programAt));
                     index++;
@@ -340,7 +352,8 @@ public class ProgramDataManagerTest extends AndroidTestCase {
             ProgramInfo stub = ProgramInfo.create();
             ProgramInfoWrapper last = programList.get(programList.size() - 1);
             while (last.startTimeMs < endTimeMs) {
-                ProgramInfo nextProgramInfo = stub.build(getContext(), last.index + 1);
+                ProgramInfo nextProgramInfo = stub.build(InstrumentationRegistry.getContext(),
+                        last.index + 1);
                 ProgramInfoWrapper next = new ProgramInfoWrapper(last.index + 1,
                         last.startTimeMs + last.programInfo.durationMs, nextProgramInfo);
                 programList.add(next);
diff --git a/tests/unit/src/com/android/tv/data/ProgramTest.java b/tests/unit/src/com/android/tv/data/ProgramTest.java
index 7e474cd6..1d1f6c10 100644
--- a/tests/unit/src/com/android/tv/data/ProgramTest.java
+++ b/tests/unit/src/com/android/tv/data/ProgramTest.java
@@ -17,17 +17,18 @@ package com.android.tv.data;
 
 import static android.media.tv.TvContract.Programs.Genres.COMEDY;
 import static android.media.tv.TvContract.Programs.Genres.FAMILY_KIDS;
-
-import com.android.tv.data.Program.CriticScore;
-import com.android.tv.dvr.SeriesRecording;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import android.media.tv.TvContentRating;
 import android.media.tv.TvContract.Programs.Genres;
 import android.os.Parcel;
 import android.support.test.filters.SmallTest;
-import android.util.Log;
 
-import junit.framework.TestCase;
+import com.android.tv.data.Program.CriticScore;
+
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -37,19 +38,20 @@ import java.util.List;
  * Tests for {@link Program}.
  */
 @SmallTest
-public class ProgramTest extends TestCase {
-
+public class ProgramTest {
     private static final int NOT_FOUND_GENRE = 987;
 
     private static final int FAMILY_GENRE_ID = GenreItems.getId(FAMILY_KIDS);
 
     private static final int COMEDY_GENRE_ID = GenreItems.getId(COMEDY);
 
+    @Test
     public void testBuild() {
         Program program = new Program.Builder().build();
         assertEquals("isValid", false, program.isValid());
     }
 
+    @Test
     public void testNoGenres() {
         Program program = new Program.Builder()
                 .setCanonicalGenres("")
@@ -61,6 +63,7 @@ public class ProgramTest extends TestCase {
         assertHasGenre(program, GenreItems.ID_ALL_CHANNELS, true);
     }
 
+    @Test
     public void testFamilyGenre() {
         Program program = new Program.Builder()
                 .setCanonicalGenres(FAMILY_KIDS)
@@ -72,6 +75,7 @@ public class ProgramTest extends TestCase {
         assertHasGenre(program, GenreItems.ID_ALL_CHANNELS, true);
     }
 
+    @Test
     public void testFamilyComedyGenre() {
         Program program = new Program.Builder()
                 .setCanonicalGenres(FAMILY_KIDS + ", " + COMEDY)
@@ -83,6 +87,7 @@ public class ProgramTest extends TestCase {
         assertHasGenre(program, GenreItems.ID_ALL_CHANNELS, true);
     }
 
+    @Test
     public void testOtherGenre() {
         Program program = new Program.Builder()
                 .setCanonicalGenres("other")
@@ -94,7 +99,8 @@ public class ProgramTest extends TestCase {
         assertHasGenre(program, GenreItems.ID_ALL_CHANNELS, true);
     }
 
-    public void testParcelable() throws Exception {
+    @Test
+    public void testParcelable() {
         List<CriticScore> criticScores = new ArrayList<>();
         criticScores.add(new CriticScore("1", "2", "3"));
         criticScores.add(new CriticScore("4", "5", "6"));
@@ -139,6 +145,7 @@ public class ProgramTest extends TestCase {
         }
     }
 
+    @Test
     public void testParcelableWithCriticScore() {
         Program program = new Program.Builder()
                 .setTitle("MyTitle")
diff --git a/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java b/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java
index f5504d48..b4682dd9 100644
--- a/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java
+++ b/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java
@@ -19,8 +19,6 @@ package com.android.tv.data;
 import android.content.pm.ResolveInfo;
 import android.media.tv.TvInputInfo;
 import android.support.test.filters.SmallTest;
-import android.support.test.filters.Suppress;
-import android.test.AndroidTestCase;
 import android.util.Pair;
 
 import com.android.tv.testing.ComparatorTester;
@@ -28,6 +26,7 @@ import com.android.tv.util.SetupUtils;
 import com.android.tv.util.TestUtils;
 import com.android.tv.util.TvInputManagerHelper;
 
+import org.junit.Test;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
@@ -40,16 +39,16 @@ import java.util.LinkedHashMap;
  * Test for {@link TvInputNewComparator}
  */
 @SmallTest
-public class TvInputNewComparatorTest extends AndroidTestCase {
+public class TvInputNewComparatorTest {
+    @Test
     public void testComparator() throws Exception {
-        final LinkedHashMap<String, Pair<Boolean, Boolean>> INPUT_ID_TO_NEW_INPUT =
-                new LinkedHashMap<>();
-        INPUT_ID_TO_NEW_INPUT.put("2_new_input", new Pair(true, false));
-        INPUT_ID_TO_NEW_INPUT.put("4_new_input", new Pair(true, false));
-        INPUT_ID_TO_NEW_INPUT.put("4_old_input", new Pair(false, false));
-        INPUT_ID_TO_NEW_INPUT.put("0_old_input", new Pair(false, true));
-        INPUT_ID_TO_NEW_INPUT.put("1_old_input", new Pair(false, true));
-        INPUT_ID_TO_NEW_INPUT.put("3_old_input", new Pair(false, true));
+        LinkedHashMap<String, Pair<Boolean, Boolean>> inputIdToNewInput = new LinkedHashMap<>();
+        inputIdToNewInput.put("2_new_input", new Pair<>(true, false));
+        inputIdToNewInput.put("4_new_input", new Pair<>(true, false));
+        inputIdToNewInput.put("4_old_input", new Pair<>(false, false));
+        inputIdToNewInput.put("0_old_input", new Pair<>(false, true));
+        inputIdToNewInput.put("1_old_input", new Pair<>(false, true));
+        inputIdToNewInput.put("3_old_input", new Pair<>(false, true));
 
         SetupUtils setupUtils = Mockito.mock(SetupUtils.class);
         Mockito.when(setupUtils.isNewInput(Matchers.anyString())).thenAnswer(
@@ -57,7 +56,7 @@ public class TvInputNewComparatorTest extends AndroidTestCase {
                     @Override
                     public Boolean answer(InvocationOnMock invocation) throws Throwable {
                         String inputId = (String) invocation.getArguments()[0];
-                        return INPUT_ID_TO_NEW_INPUT.get(inputId).first;
+                        return inputIdToNewInput.get(inputId).first;
                     }
                 }
         );
@@ -66,7 +65,7 @@ public class TvInputNewComparatorTest extends AndroidTestCase {
                     @Override
                     public Boolean answer(InvocationOnMock invocation) throws Throwable {
                         String inputId = (String) invocation.getArguments()[0];
-                        return INPUT_ID_TO_NEW_INPUT.get(inputId).second;
+                        return inputIdToNewInput.get(inputId).second;
                     }
                 }
         );
@@ -83,7 +82,7 @@ public class TvInputNewComparatorTest extends AndroidTestCase {
         ComparatorTester<TvInputInfo> comparatorTester =
                 ComparatorTester.withoutEqualsTest(comparator);
         ResolveInfo resolveInfo = TestUtils.createResolveInfo("test", "test");
-        for (String id : INPUT_ID_TO_NEW_INPUT.keySet()) {
+        for (String id : inputIdToNewInput.keySet()) {
             // Put mock resolveInfo to prevent NPE in {@link TvInputInfo#toString}
             TvInputInfo info1 = TestUtils.createTvInputInfo(
                     resolveInfo, id, "test1", TvInputInfo.TYPE_TUNER, false);
diff --git a/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java b/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java
index c86bb724..7eea1be7 100644
--- a/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java
+++ b/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java
@@ -16,60 +16,57 @@
 
 package com.android.tv.data;
 
-import android.support.test.filters.SmallTest;
-import android.support.test.filters.Suppress;
-import android.test.AndroidTestCase;
-import android.test.UiThreadTest;
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.os.Looper;
+import android.support.test.filters.MediumTest;
 
 import com.android.tv.data.WatchedHistoryManager.WatchedRecord;
-import com.android.tv.testing.Utils;
 
-import java.util.concurrent.CountDownLatch;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.concurrent.TimeUnit;
 
 /**
  * Test for {@link com.android.tv.data.WatchedHistoryManagerTest}
+ * <p>
+ * This is a medium test because it load files which accessing SharedPreferences.
  */
-@SmallTest
-@Suppress // http://b/27156462
-public class WatchedHistoryManagerTest extends AndroidTestCase {
-    private static final boolean DEBUG = false;
-    private static final String TAG = "WatchedHistoryManager";
-
+@MediumTest
+public class WatchedHistoryManagerTest {
     // Wait time for expected success.
-    private static final long WAIT_TIME_OUT_MS = 1000L;
     private static final int MAX_HISTORY_SIZE = 100;
 
     private WatchedHistoryManager mWatchedHistoryManager;
     private TestWatchedHistoryManagerListener mListener;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        Utils.runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                mWatchedHistoryManager = new WatchedHistoryManager(getContext(), MAX_HISTORY_SIZE);
-                mListener = new TestWatchedHistoryManagerListener();
-                mWatchedHistoryManager.setListener(mListener);
-            }
-        });
+    @Before
+    public void setUp() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        mWatchedHistoryManager = new WatchedHistoryManager(getTargetContext(), MAX_HISTORY_SIZE);
+        mListener = new TestWatchedHistoryManagerListener();
+        mWatchedHistoryManager.setListener(mListener);
     }
 
-    private void startAndWaitForComplete() throws Exception {
+    private void startAndWaitForComplete() throws InterruptedException {
         mWatchedHistoryManager.start();
-        assertTrue(mListener.loadFinishedLatch.await(WAIT_TIME_OUT_MS, TimeUnit.MILLISECONDS));
+        assertTrue(mListener.mLoadFinished);
     }
 
-    @UiThreadTest
-    public void testIsLoaded() throws Exception {
-        assertFalse(mWatchedHistoryManager.isLoaded());
+    @Test
+    public void testIsLoaded() throws InterruptedException {
         startAndWaitForComplete();
         assertTrue(mWatchedHistoryManager.isLoaded());
     }
 
-    @UiThreadTest
-    public void testLogChannelViewStop() throws Exception {
+    @Test
+    public void testLogChannelViewStop() throws InterruptedException {
         startAndWaitForComplete();
         long fakeId = 100000000;
         long time = System.currentTimeMillis();
@@ -86,8 +83,8 @@ public class WatchedHistoryManagerTest extends AndroidTestCase {
         assertEquals(record, recordFromSharedPreferences);
     }
 
-    @UiThreadTest
-    public void testCircularHistoryQueue() throws Exception {
+    @Test
+    public void testCircularHistoryQueue() throws InterruptedException {
         startAndWaitForComplete();
         final long startChannelId = 100000000;
         long time = System.currentTimeMillis();
@@ -111,7 +108,7 @@ public class WatchedHistoryManagerTest extends AndroidTestCase {
                 mWatchedHistoryManager.getRecordFromSharedPreferences(MAX_HISTORY_SIZE));
     }
 
-    @UiThreadTest
+    @Test
     public void testWatchedRecordEquals() {
         assertTrue(new WatchedRecord(1, 2, 3).equals(new WatchedRecord(1, 2, 3)));
         assertFalse(new WatchedRecord(1, 2, 3).equals(new WatchedRecord(1, 2, 4)));
@@ -119,8 +116,8 @@ public class WatchedHistoryManagerTest extends AndroidTestCase {
         assertFalse(new WatchedRecord(1, 2, 3).equals(new WatchedRecord(4, 2, 3)));
     }
 
-    @UiThreadTest
-    public void testEncodeDecodeWatchedRecord() throws Exception {
+    @Test
+    public void testEncodeDecodeWatchedRecord() {
         long fakeId = 100000000;
         long time = System.currentTimeMillis();
         long duration = TimeUnit.MINUTES.toMillis(10);
@@ -131,11 +128,11 @@ public class WatchedHistoryManagerTest extends AndroidTestCase {
     }
 
     private class TestWatchedHistoryManagerListener implements WatchedHistoryManager.Listener {
-        public final CountDownLatch loadFinishedLatch = new CountDownLatch(1);
+        boolean mLoadFinished;
 
         @Override
         public void onLoadFinished() {
-            loadFinishedLatch.countDown();
+            mLoadFinished = true;
         }
 
         @Override
diff --git a/tests/unit/src/com/android/tv/dvr/BaseDvrDataManagerTest.java b/tests/unit/src/com/android/tv/dvr/BaseDvrDataManagerTest.java
index 1292759e..5f0ae15c 100644
--- a/tests/unit/src/com/android/tv/dvr/BaseDvrDataManagerTest.java
+++ b/tests/unit/src/com/android/tv/dvr/BaseDvrDataManagerTest.java
@@ -16,35 +16,51 @@
 
 package com.android.tv.dvr;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+
+import android.os.Build;
 import android.support.annotation.NonNull;
+import android.support.test.filters.SdkSuppress;
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
 
+import com.android.tv.common.feature.CommonFeatures;
+import com.android.tv.common.feature.TestableFeature;
+import com.android.tv.dvr.data.ScheduledRecording;
 import com.android.tv.testing.FakeClock;
 import com.android.tv.testing.dvr.RecordingTestUtils;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-/**
- * Tests for {@link BaseDvrDataManager} using {@link DvrDataManagerInMemoryImpl}.
- */
+/** Tests for {@link BaseDvrDataManager} using {@link DvrDataManagerInMemoryImpl}. */
 @SmallTest
-public class BaseDvrDataManagerTest extends AndroidTestCase {
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
+public class BaseDvrDataManagerTest {
     private static final String INPUT_ID = "input_id";
     private static final int CHANNEL_ID = 273;
 
+    private final TestableFeature mDvrFeature = CommonFeatures.DVR;
     private DvrDataManagerInMemoryImpl mDvrDataManager;
     private FakeClock mFakeClock;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
+        mDvrFeature.enableForTest();
         mFakeClock = FakeClock.createWithCurrentTime();
         mDvrDataManager = new DvrDataManagerInMemoryImpl(getContext(), mFakeClock);
     }
 
+    @After
+    public void tearDown() {
+        mDvrFeature.resetForTests();
+    }
+
+    @Test
     public void testGetNonStartedScheduledRecordings() {
         ScheduledRecording recording = mDvrDataManager
                 .addScheduledRecordingInternal(createNewScheduledRecordingStartingNow());
@@ -52,6 +68,7 @@ public class BaseDvrDataManagerTest extends AndroidTestCase {
         MoreAsserts.assertContentsInAnyOrder(result, recording);
     }
 
+    @Test
     public void testGetNonStartedScheduledRecordings_past() {
         mDvrDataManager.addScheduledRecordingInternal(createNewScheduledRecordingStartingNow());
         mFakeClock.increment(TimeUnit.MINUTES, 6);
diff --git a/tests/unit/src/com/android/tv/dvr/DvrDataManagerImplTest.java b/tests/unit/src/com/android/tv/dvr/DvrDataManagerImplTest.java
index b822f164..9771a2e5 100644
--- a/tests/unit/src/com/android/tv/dvr/DvrDataManagerImplTest.java
+++ b/tests/unit/src/com/android/tv/dvr/DvrDataManagerImplTest.java
@@ -16,24 +16,29 @@
 
 package com.android.tv.dvr;
 
+import static org.junit.Assert.assertEquals;
+
+import android.os.Build;
+import android.support.test.filters.SdkSuppress;
 import android.support.test.filters.SmallTest;
 
+import com.android.tv.dvr.data.ScheduledRecording;
 import com.android.tv.testing.dvr.RecordingTestUtils;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Tests for {@link DvrDataManagerImpl}
- */
+/** Tests for {@link DvrDataManagerImpl} */
 @SmallTest
-public class DvrDataManagerImplTest extends TestCase {
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
+public class DvrDataManagerImplTest {
     private static final String INPUT_ID = "input_id";
     private static final int CHANNEL_ID = 273;
 
-    public void testGetNextScheduledStartTimeAfter() throws Exception {
+    @Test
+    public void testGetNextScheduledStartTimeAfter() {
         long id = 1;
         List<ScheduledRecording> scheduledRecordings = new ArrayList<>();
         assertNextStartTime(scheduledRecordings, 0L, DvrDataManager.NEXT_START_TIME_NOT_FOUND);
diff --git a/tests/unit/src/com/android/tv/dvr/DvrDataManagerInMemoryImpl.java b/tests/unit/src/com/android/tv/dvr/DvrDataManagerInMemoryImpl.java
index 85e35c4d..0a7ab46c 100644
--- a/tests/unit/src/com/android/tv/dvr/DvrDataManagerInMemoryImpl.java
+++ b/tests/unit/src/com/android/tv/dvr/DvrDataManagerInMemoryImpl.java
@@ -17,14 +17,19 @@
 package com.android.tv.dvr;
 
 import android.content.Context;
+import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.test.filters.SdkSuppress;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Range;
 
 import com.android.tv.common.SoftPreconditions;
-import com.android.tv.dvr.ScheduledRecording.RecordingState;
+import com.android.tv.dvr.data.RecordedProgram;
+import com.android.tv.dvr.data.ScheduledRecording;
+import com.android.tv.dvr.data.ScheduledRecording.RecordingState;
+import com.android.tv.dvr.data.SeriesRecording;
 import com.android.tv.util.Clock;
 
 import java.util.ArrayList;
@@ -34,10 +39,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-/**
- * A DVR Data manager that stores values in memory suitable for testing.
- */
-final class DvrDataManagerInMemoryImpl extends BaseDvrDataManager {
+/** A DVR Data manager that stores values in memory suitable for testing. */
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
+public final class DvrDataManagerInMemoryImpl extends BaseDvrDataManager {
     private final static String TAG = "DvrDataManagerInMemory";
     private final AtomicLong mNextId = new AtomicLong(1);
     private final Map<Long, ScheduledRecording> mScheduledRecordings = new HashMap<>();
diff --git a/tests/unit/src/com/android/tv/dvr/DvrRecordingServiceTest.java b/tests/unit/src/com/android/tv/dvr/DvrRecordingServiceTest.java
deleted file mode 100644
index 0a203ede..00000000
--- a/tests/unit/src/com/android/tv/dvr/DvrRecordingServiceTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.tv.dvr;
-
-import static org.mockito.Mockito.verify;
-
-import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.test.ServiceTestCase;
-
-import com.android.tv.common.feature.CommonFeatures;
-import com.android.tv.common.feature.TestableFeature;
-import com.android.tv.testing.FakeClock;
-
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-
-/**
- * Tests for {@link DvrRecordingService}.
- */
-@SmallTest
-@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
-public class DvrRecordingServiceTest extends ServiceTestCase<DvrRecordingService> {
-    @Mock Scheduler mMockScheduler;
-    private final TestableFeature mDvrFeature = CommonFeatures.DVR;
-    private final FakeClock mFakeClock = FakeClock.createWithCurrentTime();
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mDvrFeature.enableForTest();
-        MockitoAnnotations.initMocks(this);
-        setupService();
-        DvrRecordingService service = getService();
-        service.setScheduler(mMockScheduler);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mDvrFeature.resetForTests();
-        super.tearDown();
-    }
-
-    public DvrRecordingServiceTest() {
-        super(DvrRecordingService.class);
-    }
-
-    public void testStartService_null() throws Exception {
-        startService(null);
-        verify(mMockScheduler, Mockito.only()).update();
-    }
-}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/tv/dvr/DvrScheduleManagerTest.java b/tests/unit/src/com/android/tv/dvr/DvrScheduleManagerTest.java
index 2850a5f7..1c77aa0e 100644
--- a/tests/unit/src/com/android/tv/dvr/DvrScheduleManagerTest.java
+++ b/tests/unit/src/com/android/tv/dvr/DvrScheduleManagerTest.java
@@ -16,32 +16,39 @@
 
 package com.android.tv.dvr;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import android.os.Build;
+import android.support.test.filters.SdkSuppress;
 import android.support.test.filters.SmallTest;
 import android.test.MoreAsserts;
 import android.util.Range;
 
+import com.android.tv.dvr.DvrScheduleManager.ConflictInfo;
+import com.android.tv.dvr.data.ScheduledRecording;
 import com.android.tv.testing.dvr.RecordingTestUtils;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
-/**
- * Tests for {@link DvrScheduleManager}
- */
+/** Tests for {@link DvrScheduleManager} */
 @SmallTest
-public class DvrScheduleManagerTest extends TestCase {
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
+public class DvrScheduleManagerTest {
     private static final String INPUT_ID = "input_id";
 
+    @Test
     public void testGetConflictingSchedules_emptySchedule() {
         List<ScheduledRecording> schedules = new ArrayList<>();
         MoreAsserts.assertEmpty(DvrScheduleManager.getConflictingSchedules(schedules, 1));
     }
 
+    @Test
     public void testGetConflictingSchedules_noConflict() {
         long priority = 0;
         long channelId = 0;
@@ -68,6 +75,7 @@ public class DvrScheduleManagerTest extends TestCase {
         MoreAsserts.assertEmpty(DvrScheduleManager.getConflictingSchedules(schedules, 3));
     }
 
+    @Test
     public void testGetConflictingSchedules_noTuner() {
         long priority = 0;
         long channelId = 0;
@@ -82,6 +90,7 @@ public class DvrScheduleManagerTest extends TestCase {
         assertEquals(schedules, DvrScheduleManager.getConflictingSchedules(schedules, 0));
     }
 
+    @Test
     public void testGetConflictingSchedules_conflict() {
         long priority = 0;
         long channelId = 0;
@@ -160,6 +169,7 @@ public class DvrScheduleManagerTest extends TestCase {
         MoreAsserts.assertEmpty(DvrScheduleManager.getConflictingSchedules(schedules, 5));
     }
 
+    @Test
     public void testGetConflictingSchedules_conflict2() {
         // The case when there is a long schedule.
         long priority = 0;
@@ -186,6 +196,7 @@ public class DvrScheduleManagerTest extends TestCase {
         MoreAsserts.assertEmpty(DvrScheduleManager.getConflictingSchedules(schedules, 2));
     }
 
+    @Test
     public void testGetConflictingSchedules_reverseOrder() {
         long priority = 0;
         long channelId = 0;
@@ -264,6 +275,7 @@ public class DvrScheduleManagerTest extends TestCase {
         MoreAsserts.assertEmpty(DvrScheduleManager.getConflictingSchedules(schedules, 5));
     }
 
+    @Test
     public void testGetConflictingSchedules_period1() {
         long priority = 0;
         long channelId = 0;
@@ -281,6 +293,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 Collections.singletonList(new Range<>(110L, 120L))), r1);
     }
 
+    @Test
     public void testGetConflictingSchedules_period2() {
         long priority = 0;
         long channelId = 0;
@@ -298,6 +311,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 Collections.singletonList(new Range<>(110L, 120L))), r1);
     }
 
+    @Test
     public void testGetConflictingSchedules_period3() {
         long priority = 0;
         long channelId = 0;
@@ -328,6 +342,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 ranges), r2, r1);
     }
 
+    @Test
     public void testGetConflictingSchedules_addSchedules1() {
         long priority = 0;
         long channelId = 0;
@@ -351,6 +366,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 schedules, 1), r1);
     }
 
+    @Test
     public void testGetConflictingSchedules_addSchedules2() {
         long priority = 0;
         long channelId = 0;
@@ -374,6 +390,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 schedules, 1), r2, r1);
     }
 
+    @Test
     public void testGetConflictingSchedules_addLowestPriority() {
         long priority = 0;
         long channelId = 0;
@@ -394,6 +411,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 schedules, 1), r1);
     }
 
+    @Test
     public void testGetConflictingSchedules_sameChannel() {
         long priority = 0;
         long channelId = 1;
@@ -405,6 +423,7 @@ public class DvrScheduleManagerTest extends TestCase {
         MoreAsserts.assertEmpty(DvrScheduleManager.getConflictingSchedules(schedules, 3));
     }
 
+    @Test
     public void testGetConflictingSchedule_startEarlyAndFail() {
         long priority = 0;
         long channelId = 0;
@@ -423,6 +442,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 r2);
     }
 
+    @Test
     public void testGetConflictingSchedule_startLate() {
         long priority = 0;
         long channelId = 0;
@@ -441,6 +461,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 r2, r1);
     }
 
+    @Test
     public void testGetConflictingSchedulesForTune_canTune() {
         // Can tune to the recorded channel if tuner count is 1.
         long priority = 0;
@@ -452,6 +473,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 channelId, 0L, priority + 1, schedules, 1));
     }
 
+    @Test
     public void testGetConflictingSchedulesForTune_cannotTune() {
         // Can't tune to a channel if other channel is recording and tuner count is 1.
         long priority = 0;
@@ -463,6 +485,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 INPUT_ID, channelId + 1, 0L, priority + 1, schedules, 1), schedules.get(0));
     }
 
+    @Test
     public void testGetConflictingSchedulesForWatching_otherChannels() {
         // The other channels are to be recorded.
         long priority = 0;
@@ -481,6 +504,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 INPUT_ID, channelToWatch, 0L, ++priority, schedules, 2), r1);
     }
 
+    @Test
     public void testGetConflictingSchedulesForWatching_sameChannel1() {
         long priority = 0;
         long channelToWatch = 1;
@@ -498,6 +522,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 INPUT_ID, channelToWatch, 0L, ++priority, schedules, 1), r2);
     }
 
+    @Test
     public void testGetConflictingSchedulesForWatching_sameChannel2() {
         long priority = 0;
         long channelToWatch = 1;
@@ -515,6 +540,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 INPUT_ID, channelToWatch, 0L, ++priority, schedules, 1), r1);
     }
 
+    @Test
     public void testGetConflictingSchedulesForWatching_sameChannelConflict1() {
         long priority = 0;
         long channelToWatch = 1;
@@ -537,6 +563,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 INPUT_ID, channelToWatch, 0L, ++priority, schedules, 1), r2, r1);
     }
 
+    @Test
     public void testGetConflictingSchedulesForWatching_sameChannelConflict2() {
         long priority = 0;
         long channelToWatch = 1;
@@ -559,6 +586,7 @@ public class DvrScheduleManagerTest extends TestCase {
                 INPUT_ID, channelToWatch, 0L, ++priority, schedules, 1), r3, r1);
     }
 
+    @Test
     public void testPartiallyConflictingSchedules() {
         long priority = 100;
         long channelId = 0;
@@ -586,49 +614,80 @@ public class DvrScheduleManagerTest extends TestCase {
                 RecordingTestUtils.createTestRecordingWithPriorityAndPeriod(++channelId,
                         --priority, 50L, 900L)
         ));
-        Map<ScheduledRecording, Boolean> conflictsInfo = DvrScheduleManager
-                .getConflictingSchedulesInfo(schedules, 1);
-
-        assertNull(conflictsInfo.get(schedules.get(0)));
-        assertFalse(conflictsInfo.get(schedules.get(1)));
-        assertTrue(conflictsInfo.get(schedules.get(2)));
-        assertTrue(conflictsInfo.get(schedules.get(3)));
-        assertNull(conflictsInfo.get(schedules.get(4)));
-        assertTrue(conflictsInfo.get(schedules.get(5)));
-        assertNull(conflictsInfo.get(schedules.get(6)));
-        assertFalse(conflictsInfo.get(schedules.get(7)));
-        assertFalse(conflictsInfo.get(schedules.get(8)));
-        assertFalse(conflictsInfo.get(schedules.get(9)));
-        assertFalse(conflictsInfo.get(schedules.get(10)));
-
-        conflictsInfo = DvrScheduleManager
-                .getConflictingSchedulesInfo(schedules, 2);
-
-        assertNull(conflictsInfo.get(schedules.get(0)));
-        assertNull(conflictsInfo.get(schedules.get(1)));
-        assertNull(conflictsInfo.get(schedules.get(2)));
-        assertNull(conflictsInfo.get(schedules.get(3)));
-        assertNull(conflictsInfo.get(schedules.get(4)));
-        assertNull(conflictsInfo.get(schedules.get(5)));
-        assertNull(conflictsInfo.get(schedules.get(6)));
-        assertFalse(conflictsInfo.get(schedules.get(7)));
-        assertFalse(conflictsInfo.get(schedules.get(8)));
-        assertFalse(conflictsInfo.get(schedules.get(9)));
-        assertTrue(conflictsInfo.get(schedules.get(10)));
-
-        conflictsInfo = DvrScheduleManager
-                .getConflictingSchedulesInfo(schedules, 3);
-
-        assertNull(conflictsInfo.get(schedules.get(0)));
-        assertNull(conflictsInfo.get(schedules.get(1)));
-        assertNull(conflictsInfo.get(schedules.get(2)));
-        assertNull(conflictsInfo.get(schedules.get(3)));
-        assertNull(conflictsInfo.get(schedules.get(4)));
-        assertNull(conflictsInfo.get(schedules.get(5)));
-        assertNull(conflictsInfo.get(schedules.get(6)));
-        assertNull(conflictsInfo.get(schedules.get(7)));
-        assertTrue(conflictsInfo.get(schedules.get(8)));
-        assertNull(conflictsInfo.get(schedules.get(9)));
-        assertTrue(conflictsInfo.get(schedules.get(10)));
+        List<ConflictInfo> conflicts = DvrScheduleManager.getConflictingSchedulesInfo(schedules, 1);
+
+        assertNotInList(schedules.get(0), conflicts);
+        assertFullConflict(schedules.get(1), conflicts);
+        assertPartialConflict(schedules.get(2), conflicts);
+        assertPartialConflict(schedules.get(3), conflicts);
+        assertNotInList(schedules.get(4), conflicts);
+        assertPartialConflict(schedules.get(5), conflicts);
+        assertNotInList(schedules.get(6), conflicts);
+        assertFullConflict(schedules.get(7), conflicts);
+        assertFullConflict(schedules.get(8), conflicts);
+        assertFullConflict(schedules.get(9), conflicts);
+        assertFullConflict(schedules.get(10), conflicts);
+
+        conflicts = DvrScheduleManager.getConflictingSchedulesInfo(schedules, 2);
+
+        assertNotInList(schedules.get(0), conflicts);
+        assertNotInList(schedules.get(1), conflicts);
+        assertNotInList(schedules.get(2), conflicts);
+        assertNotInList(schedules.get(3), conflicts);
+        assertNotInList(schedules.get(4), conflicts);
+        assertNotInList(schedules.get(5), conflicts);
+        assertNotInList(schedules.get(6), conflicts);
+        assertFullConflict(schedules.get(7), conflicts);
+        assertFullConflict(schedules.get(8), conflicts);
+        assertFullConflict(schedules.get(9), conflicts);
+        assertPartialConflict(schedules.get(10), conflicts);
+
+        conflicts = DvrScheduleManager.getConflictingSchedulesInfo(schedules, 3);
+
+        assertNotInList(schedules.get(0), conflicts);
+        assertNotInList(schedules.get(1), conflicts);
+        assertNotInList(schedules.get(2), conflicts);
+        assertNotInList(schedules.get(3), conflicts);
+        assertNotInList(schedules.get(4), conflicts);
+        assertNotInList(schedules.get(5), conflicts);
+        assertNotInList(schedules.get(6), conflicts);
+        assertNotInList(schedules.get(7), conflicts);
+        assertPartialConflict(schedules.get(8), conflicts);
+        assertNotInList(schedules.get(9), conflicts);
+        assertPartialConflict(schedules.get(10), conflicts);
+    }
+
+    private void assertNotInList(ScheduledRecording schedule, List<ConflictInfo> conflicts) {
+        for (ConflictInfo conflictInfo : conflicts) {
+            if (conflictInfo.schedule.equals(schedule)) {
+                fail(schedule + " conflicts with others.");
+            }
+        }
+    }
+
+    private void assertPartialConflict(ScheduledRecording schedule, List<ConflictInfo> conflicts) {
+        for (ConflictInfo conflictInfo : conflicts) {
+            if (conflictInfo.schedule.equals(schedule)) {
+                if (conflictInfo.partialConflict) {
+                    return;
+                } else {
+                    fail(schedule + " fully conflicts with others.");
+                }
+            }
+        }
+        fail(schedule + " doesn't conflict");
+    }
+
+    private void assertFullConflict(ScheduledRecording schedule, List<ConflictInfo> conflicts) {
+        for (ConflictInfo conflictInfo : conflicts) {
+            if (conflictInfo.schedule.equals(schedule)) {
+                if (!conflictInfo.partialConflict) {
+                    return;
+                } else {
+                    fail(schedule + " partially conflicts with others.");
+                }
+            }
+        }
+        fail(schedule + " doesn't conflict");
     }
 }
\ No newline at end of file
diff --git a/tests/unit/src/com/android/tv/dvr/EpisodicProgramLoadTaskTest.java b/tests/unit/src/com/android/tv/dvr/EpisodicProgramLoadTaskTest.java
deleted file mode 100644
index 2172d488..00000000
--- a/tests/unit/src/com/android/tv/dvr/EpisodicProgramLoadTaskTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.tv.dvr;
-
-import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
-
-import com.android.tv.dvr.EpisodicProgramLoadTask.ScheduledEpisode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Tests for {@link EpisodicProgramLoadTask}
- */
-@SmallTest
-@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
-public class EpisodicProgramLoadTaskTest extends AndroidTestCase {
-    private static final long SERIES_RECORDING_ID1 = 1;
-    private static final long SERIES_RECORDING_ID2 = 2;
-    private static final String SEASON_NUMBER1 = "SEASON NUMBER1";
-    private static final String SEASON_NUMBER2 = "SEASON NUMBER2";
-    private static final String EPISODE_NUMBER1 = "EPISODE NUMBER1";
-    private static final String EPISODE_NUMBER2 = "EPISODE NUMBER2";
-
-    public void testEpisodeAlreadyScheduled_true() {
-        List<ScheduledEpisode> episodes = new ArrayList<>();
-        ScheduledEpisode episode = new ScheduledEpisode(SERIES_RECORDING_ID1, SEASON_NUMBER1,
-                EPISODE_NUMBER1);
-        episodes.add(episode);
-        assertTrue(EpisodicProgramLoadTask.isEpisodeScheduled(episodes,
-                new ScheduledEpisode(SERIES_RECORDING_ID1, SEASON_NUMBER1, EPISODE_NUMBER1)));
-    }
-
-    public void testEpisodeAlreadyScheduled_false() {
-        List<ScheduledEpisode> episodes = new ArrayList<>();
-        ScheduledEpisode episode = new ScheduledEpisode(SERIES_RECORDING_ID1, SEASON_NUMBER1,
-                EPISODE_NUMBER1);
-        episodes.add(episode);
-        assertFalse(EpisodicProgramLoadTask.isEpisodeScheduled(episodes,
-                new ScheduledEpisode(SERIES_RECORDING_ID2, SEASON_NUMBER1, EPISODE_NUMBER1)));
-        assertFalse(EpisodicProgramLoadTask.isEpisodeScheduled(episodes,
-                new ScheduledEpisode(SERIES_RECORDING_ID1, SEASON_NUMBER2, EPISODE_NUMBER1)));
-        assertFalse(EpisodicProgramLoadTask.isEpisodeScheduled(episodes,
-                new ScheduledEpisode(SERIES_RECORDING_ID1, SEASON_NUMBER1, EPISODE_NUMBER2)));
-    }
-
-    public void testEpisodeAlreadyScheduled_null() {
-        List<ScheduledEpisode> episodes = new ArrayList<>();
-        ScheduledEpisode episode = new ScheduledEpisode(SERIES_RECORDING_ID1, SEASON_NUMBER1,
-                EPISODE_NUMBER1);
-        episodes.add(episode);
-        assertFalse(EpisodicProgramLoadTask.isEpisodeScheduled(episodes,
-                new ScheduledEpisode(SERIES_RECORDING_ID1, null, EPISODE_NUMBER1)));
-        assertFalse(EpisodicProgramLoadTask.isEpisodeScheduled(episodes,
-                new ScheduledEpisode(SERIES_RECORDING_ID1, SEASON_NUMBER1, null)));
-        assertFalse(EpisodicProgramLoadTask.isEpisodeScheduled(episodes,
-                new ScheduledEpisode(SERIES_RECORDING_ID1, null, null)));
-    }
-}
diff --git a/tests/unit/src/com/android/tv/dvr/ScheduledRecordingTest.java b/tests/unit/src/com/android/tv/dvr/ScheduledRecordingTest.java
index 96036418..b98af603 100644
--- a/tests/unit/src/com/android/tv/dvr/ScheduledRecordingTest.java
+++ b/tests/unit/src/com/android/tv/dvr/ScheduledRecordingTest.java
@@ -16,34 +16,37 @@
 
 package com.android.tv.dvr;
 
-import static com.android.tv.testing.dvr.RecordingTestUtils
-        .createTestRecordingWithIdAndPeriod;
+import static com.android.tv.testing.dvr.RecordingTestUtils.createTestRecordingWithIdAndPeriod;
 import static com.android.tv.testing.dvr.RecordingTestUtils.normalizePriority;
+import static junit.framework.TestCase.assertEquals;
 
+import android.os.Build;
+import android.support.test.filters.SdkSuppress;
 import android.support.test.filters.SmallTest;
 import android.test.MoreAsserts;
 import android.util.Range;
 
 import com.android.tv.data.Channel;
 import com.android.tv.data.Program;
+import com.android.tv.dvr.data.ScheduledRecording;
 import com.android.tv.testing.dvr.RecordingTestUtils;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-/**
- * Tests for {@link ScheduledRecordingTest}
- */
+/** Tests for {@link ScheduledRecordingTest} */
 @SmallTest
-public class ScheduledRecordingTest extends TestCase {
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
+public class ScheduledRecordingTest {
     private static final String INPUT_ID = "input_id";
     private static final int CHANNEL_ID = 273;
 
-    public void testIsOverLapping() throws Exception {
+    @Test
+    public void testIsOverLapping() {
         ScheduledRecording r = createTestRecordingWithIdAndPeriod(1, INPUT_ID, CHANNEL_ID,
                 10L, 20L);
         assertOverLapping(false, 1L, 9L, r);
@@ -59,6 +62,7 @@ public class ScheduledRecordingTest extends TestCase {
         assertOverLapping(false, 21L, 29L, r);
     }
 
+    @Test
     public void testBuildProgram() {
         Channel c = new Channel.Builder().build();
         Program p = new Program.Builder().build();
@@ -67,12 +71,14 @@ public class ScheduledRecordingTest extends TestCase {
         assertEquals("type", ScheduledRecording.TYPE_PROGRAM, actual.getType());
     }
 
+    @Test
     public void testBuildTime() {
         ScheduledRecording actual = createTestRecordingWithIdAndPeriod(1, INPUT_ID, CHANNEL_ID,
                 10L, 20L);
         assertEquals("type", ScheduledRecording.TYPE_TIMED, actual.getType());
     }
 
+    @Test
     public void testBuildFrom() {
         ScheduledRecording expected = createTestRecordingWithIdAndPeriod(1, INPUT_ID, CHANNEL_ID,
                 10L, 20L);
@@ -80,6 +86,7 @@ public class ScheduledRecordingTest extends TestCase {
         RecordingTestUtils.assertRecordingEquals(expected, actual);
     }
 
+    @Test
     public void testBuild_priority() {
         ScheduledRecording a = normalizePriority(
                 createTestRecordingWithIdAndPeriod(1, INPUT_ID, CHANNEL_ID, 10L, 20L));
diff --git a/tests/unit/src/com/android/tv/dvr/SeriesRecordingTest.java b/tests/unit/src/com/android/tv/dvr/data/SeriesRecordingTest.java
index c48fec02..790b2ee8 100644
--- a/tests/unit/src/com/android/tv/dvr/SeriesRecordingTest.java
+++ b/tests/unit/src/com/android/tv/dvr/data/SeriesRecordingTest.java
@@ -14,7 +14,9 @@
  * limitations under the License
  */
 
-package com.android.tv.dvr;
+package com.android.tv.dvr.data;
+
+import static org.junit.Assert.assertEquals;
 
 import android.os.Build;
 import android.os.Parcel;
@@ -23,14 +25,14 @@ import android.support.test.filters.SmallTest;
 
 import com.android.tv.data.Program;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 /**
  * Tests for {@link SeriesRecording}.
  */
 @SmallTest
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
-public class SeriesRecordingTest extends TestCase {
+public class SeriesRecordingTest {
     private static final String PROGRAM_TITLE = "MyProgram";
     private static final long CHANNEL_ID = 123;
     private static final long OTHER_CHANNEL_ID = 321;
@@ -46,7 +48,8 @@ public class SeriesRecordingTest extends TestCase {
     private final Program mBaseProgram = new Program.Builder().setTitle(PROGRAM_TITLE)
             .setChannelId(CHANNEL_ID).setSeriesId(SERIES_ID).build();
 
-    public void testParcelable() throws Exception {
+    @Test
+    public void testParcelable() {
         SeriesRecording r1 = new SeriesRecording.Builder()
                 .setId(1)
                 .setChannelId(2)
@@ -77,20 +80,24 @@ public class SeriesRecordingTest extends TestCase {
         }
     }
 
+    @Test
     public void testDoesProgramMatch_simpleMatch() {
         assertDoesProgramMatch(mBaseProgram, mBaseSeriesRecording, true);
     }
 
+    @Test
     public void testDoesProgramMatch_differentSeriesId() {
         Program program = new Program.Builder(mBaseProgram).setSeriesId(OTHER_SERIES_ID).build();
         assertDoesProgramMatch(program, mBaseSeriesRecording, false);
     }
 
+    @Test
     public void testDoesProgramMatch_differentChannel() {
         Program program = new Program.Builder(mBaseProgram).setChannelId(OTHER_CHANNEL_ID).build();
         assertDoesProgramMatch(program, mBaseSeriesRecording, false);
     }
 
+    @Test
     public void testDoesProgramMatch_startFromSeason2() {
         Program program = mBaseProgram;
         assertDoesProgramMatch(program, mSeriesRecordingSeason2, true);
@@ -102,6 +109,7 @@ public class SeriesRecordingTest extends TestCase {
         assertDoesProgramMatch(program, mSeriesRecordingSeason2, true);
     }
 
+    @Test
     public void testDoesProgramMatch_startFromSeason2episode5() {
         Program program = mBaseProgram;
         assertDoesProgramMatch(program, mSeriesRecordingSeason2Episode5, true);
diff --git a/tests/unit/src/com/android/tv/dvr/DvrDbSyncTest.java b/tests/unit/src/com/android/tv/dvr/provider/DvrDbSyncTest.java
index 7cb3721c..94f88a51 100644
--- a/tests/unit/src/com/android/tv/dvr/DvrDbSyncTest.java
+++ b/tests/unit/src/com/android/tv/dvr/provider/DvrDbSyncTest.java
@@ -14,8 +14,10 @@
  * limitations under the License
  */
 
-package com.android.tv.dvr;
+package com.android.tv.dvr.provider;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.never;
@@ -25,20 +27,26 @@ import static org.mockito.Mockito.when;
 import android.os.Build;
 import android.support.test.filters.SdkSuppress;
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 
 import com.android.tv.data.ChannelDataManager;
 import com.android.tv.data.Program;
+import com.android.tv.dvr.DvrDataManagerImpl;
+import com.android.tv.dvr.DvrManager;
+import com.android.tv.dvr.data.ScheduledRecording;
+import com.android.tv.dvr.data.SeriesRecording;
+import com.android.tv.dvr.recorder.SeriesRecordingScheduler;
 
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 /**
- * Tests for {@link DvrScheduleManager}
+ * Tests for {@link com.android.tv.dvr.DvrScheduleManager}
  */
 @SmallTest
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
-public class DvrDbSyncTest extends AndroidTestCase {
+public class DvrDbSyncTest {
     private static final String INPUT_ID = "input_id";
     private static final long BASE_PROGRAM_ID = 1;
     private static final long BASE_START_TIME_MS = 0;
@@ -47,28 +55,39 @@ public class DvrDbSyncTest extends AndroidTestCase {
     private static final String BASE_EPISODE_NUMBER = "3";
     private static final Program BASE_PROGRAM = new Program.Builder().setId(BASE_PROGRAM_ID)
             .setStartTimeUtcMillis(BASE_START_TIME_MS).setEndTimeUtcMillis(BASE_END_TIME_MS)
+            .build();
+    private static final Program BASE_SERIES_PROGRAM = new Program.Builder().setId(BASE_PROGRAM_ID)
+            .setStartTimeUtcMillis(BASE_START_TIME_MS).setEndTimeUtcMillis(BASE_END_TIME_MS)
             .setSeasonNumber(BASE_SEASON_NUMBER).setEpisodeNumber(BASE_EPISODE_NUMBER).build();
     private static final ScheduledRecording BASE_SCHEDULE =
             ScheduledRecording.builder(INPUT_ID, BASE_PROGRAM).build();
+    private static final ScheduledRecording BASE_SERIES_SCHEDULE =
+            ScheduledRecording.builder(INPUT_ID, BASE_SERIES_PROGRAM).build();
 
     private DvrDbSync mDbSync;
+    @Mock private DvrManager mDvrManager;
     @Mock private DvrDataManagerImpl mDataManager;
     @Mock private ChannelDataManager mChannelDataManager;
+    @Mock private SeriesRecordingScheduler mSeriesRecordingScheduler;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
         when(mChannelDataManager.isDbLoadFinished()).thenReturn(true);
-        mDbSync = new DvrDbSync(getContext(), mDataManager, mChannelDataManager);
+        when(mDvrManager.addSeriesRecording(anyObject(), anyObject(), anyInt()))
+                .thenReturn(SeriesRecording.builder(INPUT_ID, BASE_PROGRAM).build());
+        mDbSync = new DvrDbSync(getContext(), mDataManager, mChannelDataManager,
+                mDvrManager, mSeriesRecordingScheduler);
     }
 
+    @Test
     public void testHandleUpdateProgram_null() {
         addSchedule(BASE_PROGRAM_ID, BASE_SCHEDULE);
         mDbSync.handleUpdateProgram(null, BASE_PROGRAM_ID);
         verify(mDataManager).removeScheduledRecording(BASE_SCHEDULE);
     }
 
+    @Test
     public void testHandleUpdateProgram_changeTimeNotStarted() {
         addSchedule(BASE_PROGRAM_ID, BASE_SCHEDULE);
         long startTimeMs = BASE_START_TIME_MS + 1;
@@ -79,6 +98,7 @@ public class DvrDbSyncTest extends AndroidTestCase {
         assertUpdateScheduleCalled(program);
     }
 
+    @Test
     public void testHandleUpdateProgram_changeTimeInProgressNotCalled() {
         addSchedule(BASE_PROGRAM_ID, ScheduledRecording.buildFrom(BASE_SCHEDULE)
                 .setState(ScheduledRecording.STATE_RECORDING_IN_PROGRESS).build());
@@ -89,22 +109,24 @@ public class DvrDbSyncTest extends AndroidTestCase {
         verify(mDataManager, never()).updateScheduledRecording(anyObject());
     }
 
+    @Test
     public void testHandleUpdateProgram_changeSeason() {
-        addSchedule(BASE_PROGRAM_ID, BASE_SCHEDULE);
+        addSchedule(BASE_PROGRAM_ID, BASE_SERIES_SCHEDULE);
         String seasonNumber = BASE_SEASON_NUMBER + "1";
         String episodeNumber = BASE_EPISODE_NUMBER + "1";
-        Program program = new Program.Builder(BASE_PROGRAM).setSeasonNumber(seasonNumber)
+        Program program = new Program.Builder(BASE_SERIES_PROGRAM).setSeasonNumber(seasonNumber)
                 .setEpisodeNumber(episodeNumber).build();
         mDbSync.handleUpdateProgram(program, BASE_PROGRAM_ID);
         assertUpdateScheduleCalled(program);
     }
 
+    @Test
     public void testHandleUpdateProgram_finished() {
-        addSchedule(BASE_PROGRAM_ID, ScheduledRecording.buildFrom(BASE_SCHEDULE)
+        addSchedule(BASE_PROGRAM_ID, ScheduledRecording.buildFrom(BASE_SERIES_SCHEDULE)
                 .setState(ScheduledRecording.STATE_RECORDING_FINISHED).build());
         String seasonNumber = BASE_SEASON_NUMBER + "1";
         String episodeNumber = BASE_EPISODE_NUMBER + "1";
-        Program program = new Program.Builder(BASE_PROGRAM).setSeasonNumber(seasonNumber)
+        Program program = new Program.Builder(BASE_SERIES_PROGRAM).setSeasonNumber(seasonNumber)
                 .setEpisodeNumber(episodeNumber).build();
         mDbSync.handleUpdateProgram(program, BASE_PROGRAM_ID);
         verify(mDataManager, never()).updateScheduledRecording(anyObject());
diff --git a/tests/unit/src/com/android/tv/dvr/provider/EpisodicProgramLoadTaskTest.java b/tests/unit/src/com/android/tv/dvr/provider/EpisodicProgramLoadTaskTest.java
new file mode 100644
index 00000000..216d4d5b
--- /dev/null
+++ b/tests/unit/src/com/android/tv/dvr/provider/EpisodicProgramLoadTaskTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.tv.dvr.provider;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.os.Build;
+import android.support.test.filters.SdkSuppress;
+import android.support.test.filters.SmallTest;
+
+import com.android.tv.dvr.data.SeasonEpisodeNumber;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tests for {@link EpisodicProgramLoadTask}
+ */
+@SmallTest
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
+public class EpisodicProgramLoadTaskTest {
+    private static final long SERIES_RECORDING_ID1 = 1;
+    private static final long SERIES_RECORDING_ID2 = 2;
+    private static final String SEASON_NUMBER1 = "SEASON NUMBER1";
+    private static final String SEASON_NUMBER2 = "SEASON NUMBER2";
+    private static final String EPISODE_NUMBER1 = "EPISODE NUMBER1";
+    private static final String EPISODE_NUMBER2 = "EPISODE NUMBER2";
+
+    @Test
+    public void testEpisodeAlreadyScheduled_true() {
+        List<SeasonEpisodeNumber> seasonEpisodeNumbers = new ArrayList<>();
+        SeasonEpisodeNumber seasonEpisodeNumber = new SeasonEpisodeNumber(
+                SERIES_RECORDING_ID1, SEASON_NUMBER1, EPISODE_NUMBER1);
+        seasonEpisodeNumbers.add(seasonEpisodeNumber);
+        assertTrue(seasonEpisodeNumbers.contains(
+                new SeasonEpisodeNumber(SERIES_RECORDING_ID1, SEASON_NUMBER1, EPISODE_NUMBER1)));
+    }
+
+    @Test
+    public void testEpisodeAlreadyScheduled_false() {
+        List<SeasonEpisodeNumber> seasonEpisodeNumbers = new ArrayList<>();
+        SeasonEpisodeNumber seasonEpisodeNumber = new SeasonEpisodeNumber(
+                SERIES_RECORDING_ID1, SEASON_NUMBER1, EPISODE_NUMBER1);
+        seasonEpisodeNumbers.add(seasonEpisodeNumber);
+        assertFalse(seasonEpisodeNumbers.contains(
+                new SeasonEpisodeNumber(SERIES_RECORDING_ID2, SEASON_NUMBER1, EPISODE_NUMBER1)));
+        assertFalse(seasonEpisodeNumbers.contains(
+                new SeasonEpisodeNumber(SERIES_RECORDING_ID1, SEASON_NUMBER2, EPISODE_NUMBER1)));
+        assertFalse(seasonEpisodeNumbers.contains(
+                new SeasonEpisodeNumber(SERIES_RECORDING_ID1, SEASON_NUMBER1, EPISODE_NUMBER2)));
+    }
+
+    @Test
+    public void testEpisodeAlreadyScheduled_null() {
+        List<SeasonEpisodeNumber> seasonEpisodeNumbers = new ArrayList<>();
+        SeasonEpisodeNumber seasonEpisodeNumber = new SeasonEpisodeNumber(
+                SERIES_RECORDING_ID1, SEASON_NUMBER1, EPISODE_NUMBER1);
+        seasonEpisodeNumbers.add(seasonEpisodeNumber);
+        assertFalse(seasonEpisodeNumbers.contains(
+                new SeasonEpisodeNumber(SERIES_RECORDING_ID1, null, EPISODE_NUMBER1)));
+        assertFalse(seasonEpisodeNumbers.contains(
+                new SeasonEpisodeNumber(SERIES_RECORDING_ID1, SEASON_NUMBER1, null)));
+        assertFalse(seasonEpisodeNumbers.contains(
+                new SeasonEpisodeNumber(SERIES_RECORDING_ID1, null, null)));
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/tv/dvr/recorder/DvrRecordingServiceTest.java b/tests/unit/src/com/android/tv/dvr/recorder/DvrRecordingServiceTest.java
new file mode 100644
index 00000000..8f7dcaf2
--- /dev/null
+++ b/tests/unit/src/com/android/tv/dvr/recorder/DvrRecordingServiceTest.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.tv.dvr.recorder;
+
+import static org.mockito.Mockito.verify;
+
+import android.content.Intent;
+import android.os.Build;
+import android.support.test.filters.SdkSuppress;
+import android.support.test.filters.SmallTest;
+import android.test.ServiceTestCase;
+
+import com.android.tv.common.feature.CommonFeatures;
+import com.android.tv.common.feature.TestableFeature;
+
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+/**
+ * Tests for {@link DvrRecordingService}.
+ */
+@SmallTest
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
+public class DvrRecordingServiceTest
+        extends ServiceTestCase<DvrRecordingServiceTest.MockDvrRecordingService> {
+    private final TestableFeature mDvrFeature = CommonFeatures.DVR;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mDvrFeature.enableForTest();
+        MockitoAnnotations.initMocks(this);
+        setupService();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        mDvrFeature.resetForTests();
+        super.tearDown();
+    }
+
+    public DvrRecordingServiceTest() {
+        super(MockDvrRecordingService.class);
+    }
+
+    public void testStartService_null() throws Exception {
+        // Not recording
+        startService(null);
+        assertFalse(getService().mInForeground);
+
+        // Recording
+        getService().startRecording();
+        startService(null);
+        assertTrue(getService().mInForeground);
+        assertTrue(getService().mIsRecording);
+        getService().reset();
+    }
+
+    public void testStartService_noUpcomingRecording() throws Exception {
+        Intent intent = new Intent(getContext(), DvrRecordingServiceTest.class);
+        intent.putExtra(DvrRecordingService.EXTRA_START_FOR_RECORDING, false);
+
+        // Not recording
+        startService(intent);
+        assertTrue(getService().mInForeground);
+        assertFalse(getService().mForegroundForUpcomingRecording);
+        getService().stopForegroundIfNotRecordingInternal();
+        assertFalse(getService().mInForeground);
+
+        // Recording, ended quickly
+        getService().startRecording();
+        startService(intent);
+        assertTrue(getService().mInForeground);
+        assertTrue(getService().mForegroundForUpcomingRecording);
+        assertTrue(getService().mIsRecording);
+        getService().stopRecording();
+        assertFalse(getService().mInForeground);
+        assertFalse(getService().mIsRecording);
+        getService().stopForegroundIfNotRecordingInternal();
+        assertFalse(getService().mInForeground);
+        assertFalse(getService().mIsRecording);
+        getService().reset();
+
+        // Recording, ended later
+        getService().startRecording();
+        startService(intent);
+        assertTrue(getService().mInForeground);
+        assertTrue(getService().mForegroundForUpcomingRecording);
+        assertTrue(getService().mIsRecording);
+        getService().stopForegroundIfNotRecordingInternal();
+        assertTrue(getService().mInForeground);
+        assertTrue(getService().mForegroundForUpcomingRecording);
+        assertTrue(getService().mIsRecording);
+        getService().stopRecording();
+        assertFalse(getService().mInForeground);
+        assertFalse(getService().mIsRecording);
+        getService().reset();
+    }
+
+    public void testStartService_hasUpcomingRecording() throws Exception {
+        Intent intent = new Intent(getContext(), DvrRecordingServiceTest.class);
+        intent.putExtra(DvrRecordingService.EXTRA_START_FOR_RECORDING, true);
+
+        // Not recording
+        startService(intent);
+        assertTrue(getService().mInForeground);
+        assertTrue(getService().mForegroundForUpcomingRecording);
+        assertFalse(getService().mIsRecording);
+        getService().startRecording();
+        assertTrue(getService().mInForeground);
+        assertTrue(getService().mForegroundForUpcomingRecording);
+        assertTrue(getService().mIsRecording);
+        getService().stopRecording();
+        assertFalse(getService().mInForeground);
+        assertFalse(getService().mIsRecording);
+        getService().reset();
+
+        // Recording
+        getService().startRecording();
+        startService(intent);
+        assertTrue(getService().mInForeground);
+        assertTrue(getService().mForegroundForUpcomingRecording);
+        assertTrue(getService().mIsRecording);
+        getService().startRecording();
+        assertTrue(getService().mInForeground);
+        assertTrue(getService().mForegroundForUpcomingRecording);
+        assertTrue(getService().mIsRecording);
+        getService().stopRecording();
+        assertTrue(getService().mInForeground);
+        assertTrue(getService().mForegroundForUpcomingRecording);
+        assertTrue(getService().mIsRecording);
+        getService().stopRecording();
+        assertFalse(getService().mInForeground);
+        assertFalse(getService().mIsRecording);
+        getService().reset();
+    }
+
+    public static class MockDvrRecordingService extends DvrRecordingService {
+        private int mRecordingCount = 0;
+        private boolean mInForeground;
+        private boolean mForegroundForUpcomingRecording;
+
+        @Override
+        protected void startForegroundInternal(boolean hasUpcomingRecording) {
+            mForegroundForUpcomingRecording = hasUpcomingRecording;
+            mInForeground = true;
+        }
+
+        @Override
+        protected void stopForegroundInternal() {
+            mInForeground = false;
+        }
+
+        private void startRecording() {
+            mOnRecordingSessionChangeListener.onRecordingSessionChange(true, ++mRecordingCount);
+        }
+
+        private void stopRecording() {
+            mOnRecordingSessionChangeListener.onRecordingSessionChange(false, --mRecordingCount);
+        }
+
+        private void reset() {
+            mRecordingCount = 0;
+            mInForeground = false;
+            mIsRecording = false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/tv/dvr/InputTaskSchedulerTest.java b/tests/unit/src/com/android/tv/dvr/recorder/InputTaskSchedulerTest.java
index 85c78ce2..e5c27e2c 100644
--- a/tests/unit/src/com/android/tv/dvr/InputTaskSchedulerTest.java
+++ b/tests/unit/src/com/android/tv/dvr/recorder/InputTaskSchedulerTest.java
@@ -14,13 +14,15 @@
  * limitations under the License
  */
 
-package com.android.tv.dvr;
+package com.android.tv.dvr.recorder;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyLong;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.after;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -28,21 +30,25 @@ import static org.mockito.Mockito.when;
 import android.app.AlarmManager;
 import android.media.tv.TvInputInfo;
 import android.os.Build;
-import android.os.Handler;
 import android.os.Looper;
+import android.os.SystemClock;
 import android.support.test.filters.SdkSuppress;
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 
 import com.android.tv.InputSessionManager;
 import com.android.tv.data.Channel;
 import com.android.tv.data.ChannelDataManager;
-import com.android.tv.dvr.InputTaskScheduler.RecordingTaskFactory;
+import com.android.tv.dvr.DvrManager;
+import com.android.tv.dvr.WritableDvrDataManager;
+import com.android.tv.dvr.data.ScheduledRecording;
+import com.android.tv.dvr.recorder.InputTaskScheduler.RecordingTaskFactory;
 import com.android.tv.testing.FakeClock;
 import com.android.tv.testing.dvr.RecordingTestUtils;
 import com.android.tv.util.Clock;
 import com.android.tv.util.TestUtils;
 
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
@@ -55,7 +61,7 @@ import java.util.concurrent.TimeUnit;
  */
 @SmallTest
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
-public class InputTaskSchedulerTest extends AndroidTestCase {
+public class InputTaskSchedulerTest {
     private static final String INPUT_ID = "input_id";
     private static final int CHANNEL_ID = 1;
     private static final long LISTENER_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(1);
@@ -73,21 +79,18 @@ public class InputTaskSchedulerTest extends AndroidTestCase {
     @Mock private ChannelDataManager mChannelDataManager;
     private List<RecordingTask> mRecordingTasks;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         if (Looper.myLooper() == null) {
             Looper.prepare();
         }
-        Handler fakeMainHandler = new Handler();
-        Handler workerThreadHandler = new Handler();
         mRecordingTasks = new ArrayList();
         MockitoAnnotations.initMocks(this);
         mFakeClock = FakeClock.createWithCurrentTime();
         TvInputInfo input = createTvInputInfo(TUNER_COUNT_ONE);
         mScheduler = new InputTaskScheduler(getContext(), input, Looper.myLooper(),
                 mChannelDataManager, mDvrManager, mDataManager, mSessionManager, mFakeClock,
-                fakeMainHandler, workerThreadHandler, new RecordingTaskFactory() {
+                new RecordingTaskFactory() {
                     @Override
                     public RecordingTask createRecordingTask(ScheduledRecording scheduledRecording,
                             Channel channel, DvrManager dvrManager,
@@ -102,12 +105,8 @@ public class InputTaskSchedulerTest extends AndroidTestCase {
                 });
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    public void testAddSchedule_past() throws Exception {
+    @Test
+    public void testAddSchedule_past() {
         ScheduledRecording r = RecordingTestUtils.createTestRecordingWithPeriod(INPUT_ID,
                 CHANNEL_ID, 0L, 1L);
         when(mDataManager.getScheduledRecording(anyLong())).thenReturn(r);
@@ -118,7 +117,8 @@ public class InputTaskSchedulerTest extends AndroidTestCase {
                         eq(ScheduledRecording.STATE_RECORDING_FAILED));
     }
 
-    public void testAddSchedule_start() throws Exception {
+    @Test
+    public void testAddSchedule_start() {
         mScheduler.handleAddSchedule(RecordingTestUtils.createTestRecordingWithPeriod(INPUT_ID,
                 CHANNEL_ID, mFakeClock.currentTimeMillis(),
                 mFakeClock.currentTimeMillis() + TimeUnit.HOURS.toMillis(1)));
@@ -126,7 +126,8 @@ public class InputTaskSchedulerTest extends AndroidTestCase {
         verify(mRecordingTasks.get(0), timeout((int) LISTENER_TIMEOUT_MS).times(1)).start();
     }
 
-    public void testAddSchedule_consecutiveNoStop() throws Exception {
+    @Test
+    public void testAddSchedule_consecutiveNoStop() {
         long startTimeMs = mFakeClock.currentTimeMillis();
         long endTimeMs = startTimeMs + TimeUnit.SECONDS.toMillis(1);
         long id = 0;
@@ -143,10 +144,12 @@ public class InputTaskSchedulerTest extends AndroidTestCase {
         verify(mRecordingTasks.get(0), timeout((int) LISTENER_TIMEOUT_MS).times(1)).start();
         // The first schedule should not be stopped because the second one should wait for the end
         // of the first schedule.
-        verify(mRecordingTasks.get(0), after((int) LISTENER_TIMEOUT_MS).never()).stop();
+        SystemClock.sleep(LISTENER_TIMEOUT_MS);
+        verify(mRecordingTasks.get(0), never()).stop();
     }
 
-    public void testAddSchedule_consecutiveNoFail() throws Exception {
+    @Test
+    public void testAddSchedule_consecutiveNoFail() {
         long startTimeMs = mFakeClock.currentTimeMillis();
         long endTimeMs = startTimeMs + TimeUnit.SECONDS.toMillis(1);
         long id = 0;
@@ -163,13 +166,16 @@ public class InputTaskSchedulerTest extends AndroidTestCase {
                         LOW_PRIORITY, startTimeMs, endTimeMs));
         mScheduler.handleBuildSchedule();
         verify(mRecordingTasks.get(0), timeout((int) LISTENER_TIMEOUT_MS).times(1)).start();
-        verify(mRecordingTasks.get(0), after((int) LISTENER_TIMEOUT_MS).never()).stop();
+        SystemClock.sleep(LISTENER_TIMEOUT_MS);
+        verify(mRecordingTasks.get(0), never()).stop();
         // The second schedule should not fail because it can starts after the first one finishes.
-        verify(mDataManager, after((int) LISTENER_TIMEOUT_MS).never())
+        SystemClock.sleep(LISTENER_TIMEOUT_MS);
+        verify(mDataManager, never())
                 .changeState(any(ScheduledRecording.class),
                         eq(ScheduledRecording.STATE_RECORDING_FAILED));
     }
 
+    @Test
     public void testAddSchedule_consecutiveUseLessSession() throws Exception {
         TvInputInfo input = createTvInputInfo(TUNER_COUNT_TWO);
         mScheduler.updateTvInputInfo(input);
@@ -187,23 +193,27 @@ public class InputTaskSchedulerTest extends AndroidTestCase {
                         HIGH_PRIORITY, startTimeMs, endTimeMs));
         mScheduler.handleBuildSchedule();
         verify(mRecordingTasks.get(0), timeout((int) LISTENER_TIMEOUT_MS).times(1)).start();
-        verify(mRecordingTasks.get(0), after((int) LISTENER_TIMEOUT_MS).never()).stop();
+        SystemClock.sleep(LISTENER_TIMEOUT_MS);
+        verify(mRecordingTasks.get(0), never()).stop();
         // The second schedule should wait until the first one finishes rather than creating a new
         // session even though there are available tuners.
         assertTrue(mRecordingTasks.size() == 1);
     }
 
-    public void testUpdateSchedule_noCancel() throws Exception {
+    @Test
+    public void testUpdateSchedule_noCancel() {
         ScheduledRecording r = RecordingTestUtils.createTestRecordingWithPeriod(INPUT_ID,
                 CHANNEL_ID, mFakeClock.currentTimeMillis(),
                 mFakeClock.currentTimeMillis() + TimeUnit.HOURS.toMillis(1));
         mScheduler.handleAddSchedule(r);
         mScheduler.handleBuildSchedule();
         mScheduler.handleUpdateSchedule(r);
-        verify(mRecordingTasks.get(0), after((int) LISTENER_TIMEOUT_MS).never()).cancel();
+        SystemClock.sleep(LISTENER_TIMEOUT_MS);
+        verify(mRecordingTasks.get(0), never()).cancel();
     }
 
-    public void testUpdateSchedule_cancel() throws Exception {
+    @Test
+    public void testUpdateSchedule_cancel() {
         ScheduledRecording r = RecordingTestUtils.createTestRecordingWithPeriod(INPUT_ID,
                 CHANNEL_ID, mFakeClock.currentTimeMillis(),
                 mFakeClock.currentTimeMillis() + TimeUnit.HOURS.toMillis(2));
diff --git a/tests/unit/src/com/android/tv/dvr/RecordingTaskTest.java b/tests/unit/src/com/android/tv/dvr/recorder/RecordingTaskTest.java
index 7404a554..37561a42 100644
--- a/tests/unit/src/com/android/tv/dvr/RecordingTaskTest.java
+++ b/tests/unit/src/com/android/tv/dvr/recorder/RecordingTaskTest.java
@@ -14,17 +14,18 @@
  * limitations under the License
  */
 
-package com.android.tv.dvr;
+package com.android.tv.dvr.recorder;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.anyLong;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
-import static org.mockito.hamcrest.MockitoHamcrest.longThat;
 
 import android.os.Build;
 import android.os.Handler;
@@ -32,20 +33,24 @@ import android.os.Looper;
 import android.os.Message;
 import android.support.test.filters.SdkSuppress;
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 
 import com.android.tv.InputSessionManager;
 import com.android.tv.InputSessionManager.RecordingSession;
+import com.android.tv.common.feature.CommonFeatures;
+import com.android.tv.common.feature.TestableFeature;
 import com.android.tv.data.Channel;
-import com.android.tv.dvr.RecordingTask.State;
+import com.android.tv.dvr.DvrDataManagerInMemoryImpl;
+import com.android.tv.dvr.DvrManager;
+import com.android.tv.dvr.data.ScheduledRecording;
+import com.android.tv.dvr.recorder.RecordingTask.State;
 import com.android.tv.testing.FakeClock;
 import com.android.tv.testing.dvr.RecordingTestUtils;
 
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.compat.ArgumentMatcher;
 
 import java.util.concurrent.TimeUnit;
 
@@ -54,9 +59,9 @@ import java.util.concurrent.TimeUnit;
  */
 @SmallTest
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
-public class RecordingTaskTest extends AndroidTestCase {
+public class RecordingTaskTest {
     private static final long DURATION = TimeUnit.MINUTES.toMillis(30);
-    private static final long START_OFFSET_MS = Scheduler.MS_TO_WAKE_BEFORE_START;
+    private static final long START_OFFSET_MS = RecordingScheduler.MS_TO_WAKE_BEFORE_START;
     private static final String INPUT_ID = "input_id";
     private static final int CHANNEL_ID = 273;
 
@@ -66,10 +71,11 @@ public class RecordingTaskTest extends AndroidTestCase {
     @Mock DvrManager mDvrManager;
     @Mock InputSessionManager mMockSessionManager;
     @Mock RecordingSession mMockRecordingSession;
+    private final TestableFeature mDvrFeature = CommonFeatures.DVR;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
+        mDvrFeature.enableForTest();
         if (Looper.myLooper() == null) {
             Looper.prepare();
         }
@@ -78,6 +84,12 @@ public class RecordingTaskTest extends AndroidTestCase {
         mDataManager = new DvrDataManagerInMemoryImpl(getContext(), mFakeClock);
     }
 
+    @After
+    public void tearDown() {
+        mDvrFeature.resetForTests();
+    }
+
+    @Test
     public void testHandle_init() {
         Channel channel = createTestChannel();
         ScheduledRecording r = createRecording(channel);
@@ -99,6 +111,7 @@ public class RecordingTaskTest extends AndroidTestCase {
                 .setDisplayName("Test Ch " + CHANNEL_ID).build();
     }
 
+    @Test
     public void testOnConnected() {
         Channel channel = createTestChannel();
         ScheduledRecording r = createRecording(channel);
@@ -127,40 +140,10 @@ public class RecordingTaskTest extends AndroidTestCase {
         return recordingTask;
     }
 
-    private void verifySendMessageAt(int what, long when) {
-        verify(mMockHandler).sendMessageAtTime(argThat(messageMatchesWhat(what)), delta(when, 100));
-    }
-
-    private static long delta(final long value, final long delta) {
-        return longThat(new BaseMatcher<Long>() {
-            @Override
-            public boolean matches(Object item) {
-                Long other = (Long) item;
-                return other >= value - delta && other <= value + delta;
-            }
-
-            @Override
-            public void describeTo(Description description) {
-                description.appendText("eq " + value + "±" + delta);
-
-            }
-        });
-    }
-
     private Message createMessage(int what) {
         Message msg = new Message();
         msg.setTarget(mMockHandler);
         msg.what = what;
         return msg;
     }
-
-    private static ArgumentMatcher<Message> messageMatchesWhat(final int what) {
-        return new ArgumentMatcher<Message>() {
-            @Override
-            public boolean matchesObject(Object argument) {
-                Message message = (Message) argument;
-                return message.what == what;
-            }
-        };
-    }
-}
+}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/tv/dvr/ScheduledProgramReaperTest.java b/tests/unit/src/com/android/tv/dvr/recorder/ScheduledProgramReaperTest.java
index 847540c2..ca72e13f 100644
--- a/tests/unit/src/com/android/tv/dvr/ScheduledProgramReaperTest.java
+++ b/tests/unit/src/com/android/tv/dvr/recorder/ScheduledProgramReaperTest.java
@@ -14,15 +14,27 @@
  * limitations under the License.
  */
 
-package com.android.tv.dvr;
+package com.android.tv.dvr.recorder;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertTrue;
+
+import android.os.Build;
+import android.support.test.filters.SdkSuppress;
+import android.support.test.filters.SmallTest;
 import android.test.MoreAsserts;
 
+import com.android.tv.common.feature.CommonFeatures;
+import com.android.tv.common.feature.TestableFeature;
+import com.android.tv.dvr.DvrDataManagerInMemoryImpl;
+import com.android.tv.dvr.DvrManager;
+import com.android.tv.dvr.data.ScheduledRecording;
 import com.android.tv.testing.FakeClock;
 import com.android.tv.testing.dvr.RecordingTestUtils;
 
-import junit.framework.TestCase;
-
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
@@ -31,7 +43,9 @@ import java.util.concurrent.TimeUnit;
 /**
  * Tests for {@link ScheduledProgramReaper}.
  */
-public class ScheduledProgramReaperTest extends TestCase {
+@SmallTest
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
+public class ScheduledProgramReaperTest {
     private static final String INPUT_ID = "input_id";
     private static final int CHANNEL_ID = 273;
     private static final long DURATION = TimeUnit.HOURS.toMillis(1);
@@ -40,23 +54,30 @@ public class ScheduledProgramReaperTest extends TestCase {
     private FakeClock mFakeClock;
     private DvrDataManagerInMemoryImpl mDvrDataManager;
     @Mock private DvrManager mDvrManager;
+    private final TestableFeature mDvrFeature = CommonFeatures.DVR;
 
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mDvrFeature.enableForTest();
         mFakeClock = FakeClock.createWithTimeOne();
-        mDvrDataManager = new DvrDataManagerInMemoryImpl(null, mFakeClock);
+        mDvrDataManager = new DvrDataManagerInMemoryImpl(getContext(), mFakeClock);
         mReaper = new ScheduledProgramReaper(mDvrDataManager, mFakeClock);
     }
 
+    @After
+    public void tearDown() {
+        mDvrFeature.resetForTests();
+    }
+
+    @Test
     public void testRun_noRecordings() {
-        MoreAsserts.assertContentsInAnyOrder(mDvrDataManager.getAllScheduledRecordings());
+        assertTrue(mDvrDataManager.getAllScheduledRecordings().isEmpty());
         mReaper.run();
-        MoreAsserts.assertContentsInAnyOrder(mDvrDataManager.getAllScheduledRecordings());
+        assertTrue(mDvrDataManager.getAllScheduledRecordings().isEmpty());
     }
 
+    @Test
     public void testRun_oneRecordingsTomorrow() {
         ScheduledRecording recording = addNewScheduledRecordingForTomorrow();
         MoreAsserts
@@ -66,6 +87,7 @@ public class ScheduledProgramReaperTest extends TestCase {
                 .assertContentsInAnyOrder(mDvrDataManager.getAllScheduledRecordings(), recording);
     }
 
+    @Test
     public void testRun_oneRecordingsStarted() {
         ScheduledRecording recording = addNewScheduledRecordingForTomorrow();
         MoreAsserts
@@ -76,6 +98,7 @@ public class ScheduledProgramReaperTest extends TestCase {
                 .assertContentsInAnyOrder(mDvrDataManager.getAllScheduledRecordings(), recording);
     }
 
+    @Test
     public void testRun_oneRecordingsFinished() {
         ScheduledRecording recording = addNewScheduledRecordingForTomorrow();
         MoreAsserts
@@ -87,6 +110,7 @@ public class ScheduledProgramReaperTest extends TestCase {
                 .assertContentsInAnyOrder(mDvrDataManager.getAllScheduledRecordings(), recording);
     }
 
+    @Test
     public void testRun_oneRecordingsExpired() {
         ScheduledRecording recording = addNewScheduledRecordingForTomorrow();
         MoreAsserts
@@ -97,10 +121,9 @@ public class ScheduledProgramReaperTest extends TestCase {
         mFakeClock.increment(TimeUnit.SECONDS, 1);
 
         mReaper.run();
-        MoreAsserts.assertContentsInAnyOrder(
-                "Recordings after reaper at " + com.android.tv.util.Utils
+        assertTrue("Recordings after reaper at " + com.android.tv.util.Utils
                         .toIsoDateTimeString(mFakeClock.currentTimeMillis()),
-                mDvrDataManager.getAllScheduledRecordings());
+                mDvrDataManager.getAllScheduledRecordings().isEmpty());
     }
 
     private ScheduledRecording addNewScheduledRecordingForTomorrow() {
diff --git a/tests/unit/src/com/android/tv/dvr/SchedulerTest.java b/tests/unit/src/com/android/tv/dvr/recorder/SchedulerTest.java
index 30ac1ff1..a5154729 100644
--- a/tests/unit/src/com/android/tv/dvr/SchedulerTest.java
+++ b/tests/unit/src/com/android/tv/dvr/recorder/SchedulerTest.java
@@ -14,8 +14,11 @@
  * limitations under the License
  */
 
-package com.android.tv.dvr;
+package com.android.tv.dvr.recorder;
 
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.verify;
@@ -27,14 +30,21 @@ import android.os.Build;
 import android.os.Looper;
 import android.support.test.filters.SdkSuppress;
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 
 import com.android.tv.InputSessionManager;
+import com.android.tv.common.feature.CommonFeatures;
+import com.android.tv.common.feature.TestableFeature;
 import com.android.tv.data.ChannelDataManager;
+import com.android.tv.dvr.DvrDataManagerInMemoryImpl;
+import com.android.tv.dvr.DvrManager;
+import com.android.tv.dvr.data.ScheduledRecording;
 import com.android.tv.testing.FakeClock;
 import com.android.tv.testing.dvr.RecordingTestUtils;
 import com.android.tv.util.TvInputManagerHelper;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
@@ -42,61 +52,69 @@ import org.mockito.MockitoAnnotations;
 import java.util.concurrent.TimeUnit;
 
 /**
- * Tests for {@link Scheduler}.
+ * Tests for {@link RecordingScheduler}.
  */
 @SmallTest
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
-public class SchedulerTest extends AndroidTestCase {
+public class SchedulerTest {
     private static final String INPUT_ID = "input_id";
     private static final int CHANNEL_ID = 273;
 
     private FakeClock mFakeClock;
     private DvrDataManagerInMemoryImpl mDataManager;
-    private Scheduler mScheduler;
+    private RecordingScheduler mScheduler;
     @Mock DvrManager mDvrManager;
     @Mock InputSessionManager mSessionManager;
     @Mock AlarmManager mMockAlarmManager;
     @Mock ChannelDataManager mChannelDataManager;
     @Mock TvInputManagerHelper mInputManager;
+    private final TestableFeature mDvrFeature = CommonFeatures.DVR;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mDvrFeature.enableForTest();
         mFakeClock = FakeClock.createWithCurrentTime();
-        mDataManager = new DvrDataManagerInMemoryImpl(getContext(), mFakeClock);
+        mDataManager = new DvrDataManagerInMemoryImpl(getTargetContext(), mFakeClock);
         Mockito.when(mChannelDataManager.isDbLoadFinished()).thenReturn(true);
-        mScheduler = new Scheduler(Looper.myLooper(), mDvrManager, mSessionManager, mDataManager,
-                mChannelDataManager, mInputManager, getContext(), mFakeClock, mMockAlarmManager);
+        mScheduler = new RecordingScheduler(Looper.myLooper(), mDvrManager, mSessionManager, mDataManager,
+                mChannelDataManager, mInputManager, getTargetContext(), mFakeClock,
+                mMockAlarmManager);
     }
 
-    public void testUpdate_none() throws Exception {
-        mScheduler.start();
-        mScheduler.update();
+    @After
+    public void tearDown() {
+        mDvrFeature.resetForTests();
+    }
+
+    @Test
+    public void testUpdate_none() {
+        mScheduler.updateAndStartServiceIfNeeded();
         verifyZeroInteractions(mMockAlarmManager);
     }
 
-    public void testUpdate_nextIn12Hours() throws Exception {
+    @Test
+    public void testUpdate_nextIn12Hours() {
         long now = mFakeClock.currentTimeMillis();
         long startTime = now + TimeUnit.HOURS.toMillis(12);
         ScheduledRecording r = RecordingTestUtils
                 .createTestRecordingWithPeriod(INPUT_ID, CHANNEL_ID, startTime,
                 startTime + TimeUnit.HOURS.toMillis(1));
         mDataManager.addScheduledRecording(r);
-        mScheduler.start();
-        verify(mMockAlarmManager).set(
+        verify(mMockAlarmManager).setExactAndAllowWhileIdle(
                 eq(AlarmManager.RTC_WAKEUP),
-                eq(startTime - Scheduler.MS_TO_WAKE_BEFORE_START),
+                eq(startTime - RecordingScheduler.MS_TO_WAKE_BEFORE_START),
                 any(PendingIntent.class));
         Mockito.reset(mMockAlarmManager);
-        mScheduler.update();
-        verify(mMockAlarmManager).set(
+        mScheduler.updateAndStartServiceIfNeeded();
+        verify(mMockAlarmManager).setExactAndAllowWhileIdle(
                 eq(AlarmManager.RTC_WAKEUP),
-                eq(startTime - Scheduler.MS_TO_WAKE_BEFORE_START),
+                eq(startTime - RecordingScheduler.MS_TO_WAKE_BEFORE_START),
                 any(PendingIntent.class));
     }
 
-    public void testStartsWithin() throws Exception {
+    @Test
+    public void testStartsWithin() {
         long now = mFakeClock.currentTimeMillis();
         long startTime = now + 3;
         ScheduledRecording r = RecordingTestUtils
diff --git a/tests/unit/src/com/android/tv/dvr/SeriesRecordingSchedulerTest.java b/tests/unit/src/com/android/tv/dvr/recorder/SeriesRecordingSchedulerTest.java
index efefb93c..16fa1baf 100644
--- a/tests/unit/src/com/android/tv/dvr/SeriesRecordingSchedulerTest.java
+++ b/tests/unit/src/com/android/tv/dvr/recorder/SeriesRecordingSchedulerTest.java
@@ -14,18 +14,27 @@
  * limitations under the License.
  */
 
-package com.android.tv.dvr;
+package com.android.tv.dvr.recorder;
+
+import static android.support.test.InstrumentationRegistry.getContext;
 
 import android.os.Build;
 import android.support.test.filters.SdkSuppress;
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
 import android.util.LongSparseArray;
 
+import com.android.tv.common.feature.CommonFeatures;
+import com.android.tv.common.feature.TestableFeature;
 import com.android.tv.data.Program;
+import com.android.tv.dvr.DvrDataManagerInMemoryImpl;
+import com.android.tv.dvr.data.SeriesRecording;
 import com.android.tv.testing.FakeClock;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -35,7 +44,7 @@ import java.util.List;
  */
 @SmallTest
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N)
-public class SeriesRecordingSchedulerTest extends AndroidTestCase {
+public class SeriesRecordingSchedulerTest {
     private static final String PROGRAM_TITLE = "MyProgram";
     private static final long CHANNEL_ID = 123;
     private static final long SERIES_RECORDING_ID1 = 1;
@@ -49,16 +58,23 @@ public class SeriesRecordingSchedulerTest extends AndroidTestCase {
             .setTitle(PROGRAM_TITLE).setChannelId(CHANNEL_ID).setSeriesId(SERIES_ID).build();
     private final Program mBaseProgram = new Program.Builder().setTitle(PROGRAM_TITLE)
             .setChannelId(CHANNEL_ID).setSeriesId(SERIES_ID).build();
+    private final TestableFeature mDvrFeature = CommonFeatures.DVR;
 
     private DvrDataManagerInMemoryImpl mDataManager;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
+        mDvrFeature.enableForTest();
         FakeClock fakeClock = FakeClock.createWithCurrentTime();
         mDataManager = new DvrDataManagerInMemoryImpl(getContext(), fakeClock);
     }
 
+    @After
+    public void tearDown() {
+        mDvrFeature.resetForTests();
+    }
+
+    @Test
     public void testPickOneProgramPerEpisode_onePerEpisode() {
         SeriesRecording seriesRecording = SeriesRecording.buildFrom(mBaseSeriesRecording)
                 .setId(SERIES_RECORDING_ID1).build();
@@ -75,6 +91,7 @@ public class SeriesRecordingSchedulerTest extends AndroidTestCase {
         MoreAsserts.assertContentsInAnyOrder(result.get(SERIES_RECORDING_ID1), program1, program2);
     }
 
+    @Test
     public void testPickOneProgramPerEpisode_manyPerEpisode() {
         SeriesRecording seriesRecording = SeriesRecording.buildFrom(mBaseSeriesRecording)
                 .setId(SERIES_RECORDING_ID1).build();
@@ -95,6 +112,7 @@ public class SeriesRecordingSchedulerTest extends AndroidTestCase {
         MoreAsserts.assertContentsInAnyOrder(result.get(SERIES_RECORDING_ID1), program1, program3);
     }
 
+    @Test
     public void testPickOneProgramPerEpisode_nullEpisode() {
         SeriesRecording seriesRecording = SeriesRecording.buildFrom(mBaseSeriesRecording)
                 .setId(SERIES_RECORDING_ID1).build();
diff --git a/tests/unit/src/com/android/tv/dvr/ui/SortedArrayAdapterTest.java b/tests/unit/src/com/android/tv/dvr/ui/SortedArrayAdapterTest.java
index a571e626..5667ee6b 100644
--- a/tests/unit/src/com/android/tv/dvr/ui/SortedArrayAdapterTest.java
+++ b/tests/unit/src/com/android/tv/dvr/ui/SortedArrayAdapterTest.java
@@ -22,6 +22,9 @@ import android.support.v17.leanback.widget.ObjectAdapter;
 
 import junit.framework.TestCase;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Objects;
@@ -31,29 +34,30 @@ import java.util.Objects;
  */
 @SmallTest
 public class SortedArrayAdapterTest extends TestCase {
-
-    public static final TestData P1 = TestData.create(1, "one");
-    public static final TestData P2 = TestData.create(2, "before");
-    public static final TestData P3 = TestData.create(3, "other");
-    public static final TestData EXTRA = TestData.create(4, "extra");
+    public static final TestData P1 = TestData.create(1, "c");
+    public static final TestData P2 = TestData.create(2, "b");
+    public static final TestData P3 = TestData.create(3, "a");
+    public static final TestData EXTRA = TestData.create(4, "k");
     private TestSortedArrayAdapter mAdapter;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         mAdapter = new TestSortedArrayAdapter(Integer.MAX_VALUE, null);
     }
 
+    @Test
     public void testContents_empty() {
         assertEmpty();
     }
 
+    @Test
     public void testAdd_one() {
         mAdapter.add(P1);
         assertNotEmpty();
         assertContentsInOrder(mAdapter, P1);
     }
 
+    @Test
     public void testAdd_two() {
         mAdapter.add(P1);
         mAdapter.add(P2);
@@ -61,12 +65,14 @@ public class SortedArrayAdapterTest extends TestCase {
         assertContentsInOrder(mAdapter, P2, P1);
     }
 
+    @Test
     public void testSetInitialItems_two() {
         mAdapter.setInitialItems(Arrays.asList(P1, P2));
         assertNotEmpty();
         assertContentsInOrder(mAdapter, P2, P1);
     }
 
+    @Test
     public void testMaxInitialCount() {
         mAdapter = new TestSortedArrayAdapter(1, null);
         mAdapter.setInitialItems(Arrays.asList(P1, P2));
@@ -75,6 +81,7 @@ public class SortedArrayAdapterTest extends TestCase {
         assertEquals(mAdapter.get(0), P2);
     }
 
+    @Test
     public void testExtraItem() {
         mAdapter = new TestSortedArrayAdapter(Integer.MAX_VALUE, EXTRA);
         mAdapter.setInitialItems(Arrays.asList(P1, P2));
@@ -88,6 +95,7 @@ public class SortedArrayAdapterTest extends TestCase {
         assertEquals(mAdapter.get(0), EXTRA);
     }
 
+    @Test
     public void testExtraItemWithMaxCount() {
         mAdapter = new TestSortedArrayAdapter(1, EXTRA);
         mAdapter.setInitialItems(Arrays.asList(P1, P2));
@@ -100,6 +108,7 @@ public class SortedArrayAdapterTest extends TestCase {
         assertEquals(mAdapter.get(0), EXTRA);
     }
 
+    @Test
     public void testRemove() {
         mAdapter.add(P1);
         mAdapter.add(P2);
@@ -111,8 +120,47 @@ public class SortedArrayAdapterTest extends TestCase {
         assertContentsInOrder(mAdapter, P1);
         mAdapter.remove(P1);
         assertEmpty();
+        mAdapter.add(P1);
+        mAdapter.add(P2);
+        mAdapter.add(P3);
+        assertContentsInOrder(mAdapter, P3, P2, P1);
+        mAdapter.removeItems(0, 2);
+        assertContentsInOrder(mAdapter, P1);
+        mAdapter.add(P2);
+        mAdapter.add(P3);
+        mAdapter.addExtraItem(EXTRA);
+        assertContentsInOrder(mAdapter, P3, P2, P1, EXTRA);
+        mAdapter.removeItems(1, 1);
+        assertContentsInOrder(mAdapter, P3, P1, EXTRA);
+        mAdapter.removeItems(1, 2);
+        assertContentsInOrder(mAdapter, P3);
+        mAdapter.addExtraItem(EXTRA);
+        mAdapter.addExtraItem(P2);
+        mAdapter.add(P1);
+        assertContentsInOrder(mAdapter, P3, P1, EXTRA, P2);
+        mAdapter.removeItems(1, 2);
+        assertContentsInOrder(mAdapter, P3, P2);
+        mAdapter.add(P1);
+        assertContentsInOrder(mAdapter, P3, P1, P2);
+    }
+
+    @Test
+    public void testReplace() {
+        mAdapter.add(P1);
+        mAdapter.add(P2);
+        assertNotEmpty();
+        assertContentsInOrder(mAdapter, P2, P1);
+        mAdapter.replace(1, P3);
+        assertContentsInOrder(mAdapter, P3, P2);
+        mAdapter.replace(0, P1);
+        assertContentsInOrder(mAdapter, P2, P1);
+        mAdapter.addExtraItem(EXTRA);
+        assertContentsInOrder(mAdapter, P2, P1, EXTRA);
+        mAdapter.replace(2, P3);
+        assertContentsInOrder(mAdapter, P2, P1, P3);
     }
 
+    @Test
     public void testChange_sorting() {
         TestData p2_changed = TestData.create(2, "z changed");
         mAdapter.add(P1);
@@ -123,6 +171,7 @@ public class SortedArrayAdapterTest extends TestCase {
         assertContentsInOrder(mAdapter, P1, p2_changed);
     }
 
+    @Test
     public void testChange_new() {
         mAdapter.change(P1);
         assertNotEmpty();
@@ -194,7 +243,7 @@ public class SortedArrayAdapterTest extends TestCase {
         }
 
         @Override
-        long getId(TestData item) {
+        protected long getId(TestData item) {
             return item.mId;
         }
     }
diff --git a/tests/unit/src/com/android/tv/experiments/ExperimentsTest.java b/tests/unit/src/com/android/tv/experiments/ExperimentsTest.java
new file mode 100644
index 00000000..3f827ce1
--- /dev/null
+++ b/tests/unit/src/com/android/tv/experiments/ExperimentsTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.tv.experiments;
+
+import static org.junit.Assert.assertEquals;
+
+import android.support.test.filters.SmallTest;
+
+import com.android.tv.common.BuildConfig;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tests for {@link Experiments}.
+ */
+@SmallTest
+public class ExperimentsTest {
+    @Before
+    public void setUp() {
+        ExperimentFlag.initForTest();
+    }
+
+
+    @Test
+    public void testEngOnlyDefault() {
+        assertEquals("ENABLE_DEVELOPER_FEATURES", Boolean.valueOf(BuildConfig.ENG),
+                Experiments.ENABLE_DEVELOPER_FEATURES.get());
+    }
+
+
+}
diff --git a/tests/unit/src/com/android/tv/menu/MenuTest.java b/tests/unit/src/com/android/tv/menu/MenuTest.java
index 35e2a0fe..e8cfdbef 100644
--- a/tests/unit/src/com/android/tv/menu/MenuTest.java
+++ b/tests/unit/src/com/android/tv/menu/MenuTest.java
@@ -15,11 +15,16 @@
  */
 package com.android.tv.menu;
 
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 
 import com.android.tv.menu.Menu.OnMenuVisibilityChangeListener;
 
+import org.junit.Before;
+import org.junit.Test;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
@@ -29,23 +34,23 @@ import org.mockito.stubbing.Answer;
  * Tests for {@link Menu}.
  */
 @SmallTest
-public class MenuTest extends AndroidTestCase {
+public class MenuTest {
     private Menu mMenu;
     private IMenuView mMenuView;
     private OnMenuVisibilityChangeListener mVisibilityChangeListener;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         mMenuView = Mockito.mock(IMenuView.class);
         MenuRowFactory factory = Mockito.mock(MenuRowFactory.class);
         Mockito.when(factory.createMenuRow(Mockito.any(Menu.class), Mockito.any(Class.class)))
                 .thenReturn(null);
         mVisibilityChangeListener = Mockito.mock(OnMenuVisibilityChangeListener.class);
-        mMenu = new Menu(getContext(), mMenuView, factory, mVisibilityChangeListener);
+        mMenu = new Menu(getTargetContext(), mMenuView, factory, mVisibilityChangeListener);
         mMenu.disableAnimationForTest();
     }
 
+    @Test
     public void testScheduleHide() {
         mMenu.show(Menu.REASON_NONE);
         setMenuVisible(true);
@@ -67,6 +72,7 @@ public class MenuTest extends AndroidTestCase {
         assertFalse("Hide is scheduled", mMenu.isHideScheduled());
     }
 
+    @Test
     public void testShowHide_ReasonNone() {
         // Show with REASON_NONE
         mMenu.show(Menu.REASON_NONE);
@@ -87,6 +93,7 @@ public class MenuTest extends AndroidTestCase {
         Mockito.verify(mMenuView).onHide();
     }
 
+    @Test
     public void testShowHide_ReasonGuide() {
         // Show with REASON_GUIDE
         mMenu.show(Menu.REASON_GUIDE);
@@ -107,6 +114,7 @@ public class MenuTest extends AndroidTestCase {
         Mockito.verify(mMenuView).onHide();
     }
 
+    @Test
     public void testShowHide_ReasonPlayControlsFastForward() {
         // Show with REASON_PLAY_CONTROLS_FAST_FORWARD
         mMenu.show(Menu.REASON_PLAY_CONTROLS_FAST_FORWARD);
diff --git a/tests/unit/src/com/android/tv/menu/TvOptionsRowAdapterTest.java b/tests/unit/src/com/android/tv/menu/TvOptionsRowAdapterTest.java
index 6b0726d9..49ba8514 100644
--- a/tests/unit/src/com/android/tv/menu/TvOptionsRowAdapterTest.java
+++ b/tests/unit/src/com/android/tv/menu/TvOptionsRowAdapterTest.java
@@ -15,18 +15,24 @@
  */
 package com.android.tv.menu;
 
+import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import android.media.tv.TvTrackInfo;
 import android.os.SystemClock;
 import android.support.test.filters.MediumTest;
+import android.text.TextUtils;
 
 import com.android.tv.BaseMainActivityTestCase;
-import com.android.tv.MainActivity;
-import com.android.tv.customization.CustomAction;
 import com.android.tv.testing.Constants;
-import com.android.tv.testing.Utils;
+import com.android.tv.testing.testinput.ChannelState;
 import com.android.tv.testing.testinput.ChannelStateData;
 import com.android.tv.testing.testinput.TvTestInputConstants;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -35,24 +41,22 @@ import java.util.List;
  */
 @MediumTest
 public class TvOptionsRowAdapterTest extends BaseMainActivityTestCase {
-    private static final int WAIT_TRACK_SIZE_TIMEOUT_MS = 300;
-    public static final int TRACK_SIZE_CHECK_INTERVAL_MS = 10;
+    private static final int WAIT_TRACK_EVENT_TIMEOUT_MS = 300;
+    public static final int TRACK_CHECK_INTERVAL_MS = 10;
 
     // TODO: Refactor TvOptionsRowAdapter so it does not rely on MainActivity
     private TvOptionsRowAdapter mTvOptionsRowAdapter;
 
-    public TvOptionsRowAdapterTest() {
-        super(MainActivity.class);
-    }
-
     @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() {
         super.setUp();
         mTvOptionsRowAdapter = new TvOptionsRowAdapter(mActivity, Collections.emptyList());
         tuneToChannel(TvTestInputConstants.CH_1_DEFAULT_DONT_MODIFY);
         waitUntilAudioTracksHaveSize(1);
+        waitUntilAudioTrackSelected(ChannelState.DEFAULT.getSelectedAudioTrackId());
         // update should be called on the main thread to avoid the multi-thread problem.
-        Utils.runOnMainSync(new Runnable() {
+        getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 mTvOptionsRowAdapter.update();
@@ -60,11 +64,13 @@ public class TvOptionsRowAdapterTest extends BaseMainActivityTestCase {
         });
     }
 
+    @Test
     public void testUpdateAudioAction_2tracks() {
         ChannelStateData data = new ChannelStateData();
         data.mTvTrackInfos.add(Constants.GENERIC_AUDIO_TRACK);
         updateThenTune(data, TvTestInputConstants.CH_2);
         waitUntilAudioTracksHaveSize(2);
+        waitUntilAudioTrackSelected(Constants.EN_STEREO_AUDIO_TRACK.getId());
 
         boolean result = mTvOptionsRowAdapter.updateMultiAudioAction();
         assertEquals("update Action had change", true, result);
@@ -72,46 +78,87 @@ public class TvOptionsRowAdapterTest extends BaseMainActivityTestCase {
                 MenuAction.SELECT_AUDIO_LANGUAGE_ACTION.isEnabled());
     }
 
+    @Test
     public void testUpdateAudioAction_1track() {
         ChannelStateData data = new ChannelStateData();
         data.mTvTrackInfos.clear();
         data.mTvTrackInfos.add(Constants.GENERIC_AUDIO_TRACK);
+        data.mSelectedVideoTrackId = null;
+        data.mSelectedAudioTrackId = Constants.GENERIC_AUDIO_TRACK.getId();
         updateThenTune(data, TvTestInputConstants.CH_2);
         waitUntilAudioTracksHaveSize(1);
+        waitUntilAudioTrackSelected(Constants.GENERIC_AUDIO_TRACK.getId());
 
         boolean result = mTvOptionsRowAdapter.updateMultiAudioAction();
-        assertEquals("update Action had change", false, result);
+        assertEquals("update Action had change", true, result);
         assertEquals("Multi Audio enabled", false,
                 MenuAction.SELECT_AUDIO_LANGUAGE_ACTION.isEnabled());
     }
 
+    @Test
     public void testUpdateAudioAction_noTracks() {
         ChannelStateData data = new ChannelStateData();
         data.mTvTrackInfos.clear();
+        data.mTvTrackInfos.add(ChannelState.DEFAULT_VIDEO_TRACK);
+        data.mSelectedVideoTrackId = ChannelState.DEFAULT_VIDEO_TRACK.getId();
+        data.mSelectedAudioTrackId = null;
         updateThenTune(data, TvTestInputConstants.CH_2);
-        waitUntilAudioTracksHaveSize(0);
+        // Wait for the video tracks, because there's no audio track.
+        waitUntilVideoTracksHaveSize(1);
+        waitUntilVideoTrackSelected(data.mSelectedVideoTrackId);
 
         boolean result = mTvOptionsRowAdapter.updateMultiAudioAction();
-        assertEquals("update Action had change", false, result);
+        assertEquals("update Action had change", true, result);
         assertEquals("Multi Audio enabled", false,
                 MenuAction.SELECT_AUDIO_LANGUAGE_ACTION.isEnabled());
     }
 
     private void waitUntilAudioTracksHaveSize(int expected) {
+        waitUntilTracksHaveSize(TvTrackInfo.TYPE_AUDIO, expected);
+    }
+
+    private void waitUntilVideoTracksHaveSize(int expected) {
+        waitUntilTracksHaveSize(TvTrackInfo.TYPE_VIDEO, expected);
+    }
+
+    private void waitUntilTracksHaveSize(int trackType, int expected) {
         long start = SystemClock.elapsedRealtime();
         int size = -1;
-        while (SystemClock.elapsedRealtime() < start + WAIT_TRACK_SIZE_TIMEOUT_MS) {
+        while (SystemClock.elapsedRealtime() < start + WAIT_TRACK_EVENT_TIMEOUT_MS) {
             getInstrumentation().waitForIdleSync();
-            List<TvTrackInfo> tracks = mActivity.getTracks(TvTrackInfo.TYPE_AUDIO);
+            List<TvTrackInfo> tracks = mActivity.getTracks(trackType);
             if (tracks != null) {
                 size = tracks.size();
                 if (size == expected) {
                     return;
                 }
             }
-            SystemClock.sleep(TRACK_SIZE_CHECK_INTERVAL_MS);
+            SystemClock.sleep(TRACK_CHECK_INTERVAL_MS);
         }
-        fail("Waited for " + WAIT_TRACK_SIZE_TIMEOUT_MS + " milliseconds for track size to be "
+        fail("Waited for " + WAIT_TRACK_EVENT_TIMEOUT_MS + " milliseconds for track size to be "
                 + expected + " but was " + size);
     }
+
+    private void waitUntilAudioTrackSelected(String trackId) {
+        waitUntilTrackSelected(TvTrackInfo.TYPE_AUDIO, trackId);
+    }
+
+    private void waitUntilVideoTrackSelected(String trackId) {
+        waitUntilTrackSelected(TvTrackInfo.TYPE_VIDEO, trackId);
+    }
+
+    private void waitUntilTrackSelected(int trackType, String trackId) {
+        long start = SystemClock.elapsedRealtime();
+        String selectedTrackId = null;
+        while (SystemClock.elapsedRealtime() < start + WAIT_TRACK_EVENT_TIMEOUT_MS) {
+            getInstrumentation().waitForIdleSync();
+            selectedTrackId = mActivity.getSelectedTrack(trackType);
+            if (TextUtils.equals(selectedTrackId, trackId)) {
+                return;
+            }
+            SystemClock.sleep(TRACK_CHECK_INTERVAL_MS);
+        }
+        fail("Waited for " + WAIT_TRACK_EVENT_TIMEOUT_MS + " milliseconds for track ID to be "
+                + trackId + " but was " + selectedTrackId);
+    }
 }
diff --git a/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java b/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java
index c76de8fb..db765109 100644
--- a/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java
+++ b/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java
@@ -16,11 +16,16 @@
 
 package com.android.tv.recommendation;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
+
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 
 import com.android.tv.testing.Utils;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
@@ -28,31 +33,33 @@ import java.util.concurrent.TimeUnit;
  * Unit tests for {@link ChannelRecord}.
  */
 @SmallTest
-public class ChannelRecordTest extends AndroidTestCase {
+public class ChannelRecordTest {
     private static final int CHANNEL_RECORD_MAX_HISTORY_SIZE = ChannelRecord.MAX_HISTORY_SIZE;
 
     private Random mRandom;
     private ChannelRecord mChannelRecord;
     private long mLatestWatchEndTimeMs;
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         mLatestWatchEndTimeMs = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1);
         mChannelRecord = new ChannelRecord(getContext(), null, false);
         mRandom = Utils.createTestRandom();
     }
 
+    @Test
     public void testGetLastWatchEndTime_noHistory() {
         assertEquals(0, mChannelRecord.getLastWatchEndTimeMs());
     }
 
+    @Test
     public void testGetLastWatchEndTime_oneHistory() {
         addWatchLog();
 
         assertEquals(mLatestWatchEndTimeMs, mChannelRecord.getLastWatchEndTimeMs());
     }
 
+    @Test
     public void testGetLastWatchEndTime_maxHistories() {
         for (int i = 0; i < CHANNEL_RECORD_MAX_HISTORY_SIZE; ++i) {
             addWatchLog();
@@ -61,6 +68,7 @@ public class ChannelRecordTest extends AndroidTestCase {
         assertEquals(mLatestWatchEndTimeMs, mChannelRecord.getLastWatchEndTimeMs());
     }
 
+    @Test
     public void testGetLastWatchEndTime_moreThanMaxHistories() {
         for (int i = 0; i < CHANNEL_RECORD_MAX_HISTORY_SIZE + 1; ++i) {
             addWatchLog();
@@ -69,16 +77,19 @@ public class ChannelRecordTest extends AndroidTestCase {
         assertEquals(mLatestWatchEndTimeMs, mChannelRecord.getLastWatchEndTimeMs());
     }
 
+    @Test
     public void testGetTotalWatchDuration_noHistory() {
         assertEquals(0, mChannelRecord.getTotalWatchDurationMs());
     }
 
+    @Test
     public void testGetTotalWatchDuration_oneHistory() {
         long durationMs = addWatchLog();
 
         assertEquals(durationMs, mChannelRecord.getTotalWatchDurationMs());
     }
 
+    @Test
     public void testGetTotalWatchDuration_maxHistories() {
         long totalWatchTimeMs = 0;
         for (int i = 0; i < CHANNEL_RECORD_MAX_HISTORY_SIZE; ++i) {
@@ -89,6 +100,7 @@ public class ChannelRecordTest extends AndroidTestCase {
         assertEquals(totalWatchTimeMs, mChannelRecord.getTotalWatchDurationMs());
     }
 
+    @Test
     public void testGetTotalWatchDuration_moreThanMaxHistories() {
         long totalWatchTimeMs = 0;
         long firstDurationMs = 0;
diff --git a/tests/unit/src/com/android/tv/recommendation/EvaluatorTestCase.java b/tests/unit/src/com/android/tv/recommendation/EvaluatorTestCase.java
index 0255947b..853fb245 100644
--- a/tests/unit/src/com/android/tv/recommendation/EvaluatorTestCase.java
+++ b/tests/unit/src/com/android/tv/recommendation/EvaluatorTestCase.java
@@ -16,30 +16,35 @@
 
 package com.android.tv.recommendation;
 
-import android.test.AndroidTestCase;
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import com.android.tv.data.Channel;
 import com.android.tv.recommendation.RecommendationUtils.ChannelRecordSortedMapHelper;
 import com.android.tv.recommendation.Recommender.Evaluator;
 import com.android.tv.testing.Utils;
 
+import org.junit.Before;
+
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Base test case for Recommendation Evaluator Unit tests.
  */
-public abstract class EvaluatorTestCase<T extends Evaluator> extends AndroidTestCase {
+public abstract class EvaluatorTestCase<T extends Evaluator> {
     private static final long INVALID_CHANNEL_ID = -1;
 
+    private static final double SCORE_DELTA = 0.01;
+
     private ChannelRecordSortedMapHelper mChannelRecordSortedMap;
     private RecommendationDataManager mDataManager;
 
     public T mEvaluator;
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         mChannelRecordSortedMap = new ChannelRecordSortedMapHelper(getContext());
         mDataManager = RecommendationUtils
                 .createMockRecommendationDataManager(mChannelRecordSortedMap);
@@ -91,8 +96,9 @@ public abstract class EvaluatorTestCase<T extends Evaluator> extends AndroidTest
      * Check whether scores of each channels are valid.
      */
     protected void assertChannelScoresValid() {
-        assertEquals(Evaluator.NOT_RECOMMENDED, mEvaluator.evaluateChannel(INVALID_CHANNEL_ID));
-        assertEquals(Evaluator.NOT_RECOMMENDED,
+        assertEqualScores(Evaluator.NOT_RECOMMENDED,
+                mEvaluator.evaluateChannel(INVALID_CHANNEL_ID));
+        assertEqualScores(Evaluator.NOT_RECOMMENDED,
                 mEvaluator.evaluateChannel(mChannelRecordSortedMap.size()));
 
         for (long channelId : mChannelRecordSortedMap.keySet()) {
@@ -109,6 +115,14 @@ public abstract class EvaluatorTestCase<T extends Evaluator> extends AndroidTest
         mEvaluator.onChannelRecordListChanged(new ArrayList<>(mChannelRecordSortedMap.values()));
     }
 
+    void assertEqualScores(double expected, double actual) {
+        assertEquals(expected, actual, SCORE_DELTA);
+    }
+
+    void assertEqualScores(String message, double expected, double actual) {
+        assertEquals(message, expected, actual, SCORE_DELTA);
+    }
+
     private class FakeRecommender extends Recommender {
         public FakeRecommender() {
             super(new Recommender.Listener() {
@@ -120,7 +134,7 @@ public abstract class EvaluatorTestCase<T extends Evaluator> extends AndroidTest
                 public void onRecommendationChanged() {
                 }
             }, true, mDataManager);
-    }
+        }
 
         @Override
         public ChannelRecord getChannelRecord(long channelId) {
diff --git a/tests/unit/src/com/android/tv/recommendation/FavoriteChannelEvaluatorTest.java b/tests/unit/src/com/android/tv/recommendation/FavoriteChannelEvaluatorTest.java
index aae3a932..ac701af9 100644
--- a/tests/unit/src/com/android/tv/recommendation/FavoriteChannelEvaluatorTest.java
+++ b/tests/unit/src/com/android/tv/recommendation/FavoriteChannelEvaluatorTest.java
@@ -16,8 +16,12 @@
 
 package com.android.tv.recommendation;
 
+import static org.junit.Assert.assertTrue;
+
 import android.support.test.filters.SmallTest;
 
+import org.junit.Test;
+
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -38,14 +42,16 @@ public class FavoriteChannelEvaluatorTest extends EvaluatorTestCase<FavoriteChan
         return new FavoriteChannelEvaluator();
     }
 
+    @Test
     public void testOneChannelWithNoWatchLog() {
         long channelId = addChannel().getId();
         notifyChannelAndWatchLogLoaded();
 
-        assertEquals(Recommender.Evaluator.NOT_RECOMMENDED,
+        assertEqualScores(Recommender.Evaluator.NOT_RECOMMENDED,
                 mEvaluator.evaluateChannel(channelId));
     }
 
+    @Test
     public void testOneChannelWithRandomWatchLogs() {
         addChannel();
         addRandomWatchLogs(DEFAULT_WATCH_START_TIME_MS, DEFAULT_WATCH_END_TIME_MS,
@@ -55,17 +61,19 @@ public class FavoriteChannelEvaluatorTest extends EvaluatorTestCase<FavoriteChan
         assertChannelScoresValid();
     }
 
+    @Test
     public void testMultiChannelsWithNoWatchLog() {
         addChannels(DEFAULT_NUMBER_OF_CHANNELS);
         notifyChannelAndWatchLogLoaded();
 
         List<Long> channelIdList = getChannelIdListSorted();
         for (long channelId : channelIdList) {
-            assertEquals(Recommender.Evaluator.NOT_RECOMMENDED,
+            assertEqualScores(Recommender.Evaluator.NOT_RECOMMENDED,
                     mEvaluator.evaluateChannel(channelId));
         }
     }
 
+    @Test
     public void testMultiChannelsWithRandomWatchLogs() {
         addChannels(DEFAULT_NUMBER_OF_CHANNELS);
         addRandomWatchLogs(DEFAULT_WATCH_START_TIME_MS, DEFAULT_WATCH_END_TIME_MS,
@@ -75,6 +83,7 @@ public class FavoriteChannelEvaluatorTest extends EvaluatorTestCase<FavoriteChan
         assertChannelScoresValid();
     }
 
+    @Test
     public void testMultiChannelsWithSimpleWatchLogs() {
         addChannels(DEFAULT_NUMBER_OF_CHANNELS);
         // For two channels which has ID x and y (x < y), the channel y is more watched
@@ -99,6 +108,7 @@ public class FavoriteChannelEvaluatorTest extends EvaluatorTestCase<FavoriteChan
         }
     }
 
+    @Test
     public void testTwoChannelsWithSameWatchDuration() {
         long channelOne = addChannel().getId();
         long channelTwo = addChannel().getId();
@@ -112,6 +122,7 @@ public class FavoriteChannelEvaluatorTest extends EvaluatorTestCase<FavoriteChan
                 mEvaluator.evaluateChannel(channelTwo));
     }
 
+    @Test
     public void testTwoChannelsWithDifferentWatchDuration() {
         long channelOne = addChannel().getId();
         long channelTwo = addChannel().getId();
@@ -131,6 +142,7 @@ public class FavoriteChannelEvaluatorTest extends EvaluatorTestCase<FavoriteChan
         assertTrue(mEvaluator.evaluateChannel(channelOne) > mEvaluator.evaluateChannel(channelTwo));
     }
 
+    @Test
     public void testScoreIncreasesWithNewWatchLog() {
         long channelId = addChannel().getId();
         addRandomWatchLogs(DEFAULT_WATCH_START_TIME_MS, DEFAULT_WATCH_END_TIME_MS,
diff --git a/tests/unit/src/com/android/tv/recommendation/RecentChannelEvaluatorTest.java b/tests/unit/src/com/android/tv/recommendation/RecentChannelEvaluatorTest.java
index 55a4e4ac..8f092238 100644
--- a/tests/unit/src/com/android/tv/recommendation/RecentChannelEvaluatorTest.java
+++ b/tests/unit/src/com/android/tv/recommendation/RecentChannelEvaluatorTest.java
@@ -16,8 +16,12 @@
 
 package com.android.tv.recommendation;
 
+import static org.junit.Assert.assertTrue;
+
 import android.support.test.filters.SmallTest;
 
+import org.junit.Test;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,14 +44,16 @@ public class RecentChannelEvaluatorTest extends EvaluatorTestCase<RecentChannelE
         return new RecentChannelEvaluator();
     }
 
+    @Test
     public void testOneChannelWithNoWatchLog() {
         long channelId = addChannel().getId();
         notifyChannelAndWatchLogLoaded();
 
-        assertEquals(Recommender.Evaluator.NOT_RECOMMENDED,
+        assertEqualScores(Recommender.Evaluator.NOT_RECOMMENDED,
                 mEvaluator.evaluateChannel(channelId));
     }
 
+    @Test
     public void testOneChannelWithRandomWatchLogs() {
         addChannel();
         addRandomWatchLogs(DEFAULT_WATCH_START_TIME_MS, DEFAULT_WATCH_END_TIME_MS,
@@ -57,17 +63,19 @@ public class RecentChannelEvaluatorTest extends EvaluatorTestCase<RecentChannelE
         assertChannelScoresValid();
     }
 
+    @Test
     public void testMultiChannelsWithNoWatchLog() {
         addChannels(DEFAULT_NUMBER_OF_CHANNELS);
         notifyChannelAndWatchLogLoaded();
 
         List<Long> channelIdList = getChannelIdListSorted();
         for (long channelId : channelIdList) {
-            assertEquals(Recommender.Evaluator.NOT_RECOMMENDED,
+            assertEqualScores(Recommender.Evaluator.NOT_RECOMMENDED,
                     mEvaluator.evaluateChannel(channelId));
         }
     }
 
+    @Test
     public void testMultiChannelsWithRandomWatchLogs() {
         addChannels(DEFAULT_NUMBER_OF_CHANNELS);
         addRandomWatchLogs(DEFAULT_WATCH_START_TIME_MS, DEFAULT_WATCH_END_TIME_MS,
@@ -77,6 +85,7 @@ public class RecentChannelEvaluatorTest extends EvaluatorTestCase<RecentChannelE
         assertChannelScoresValid();
     }
 
+    @Test
     public void testMultiChannelsWithSimpleWatchLogs() {
         addChannels(DEFAULT_NUMBER_OF_CHANNELS);
         // Every channel has one watch log with 1 hour. Also, for two channels
@@ -99,6 +108,7 @@ public class RecentChannelEvaluatorTest extends EvaluatorTestCase<RecentChannelE
         }
     }
 
+    @Test
     public void testScoreIncreasesWithNewWatchLog() {
         addChannels(DEFAULT_NUMBER_OF_CHANNELS);
         addRandomWatchLogs(DEFAULT_WATCH_START_TIME_MS, DEFAULT_WATCH_END_TIME_MS,
@@ -119,6 +129,7 @@ public class RecentChannelEvaluatorTest extends EvaluatorTestCase<RecentChannelE
         }
     }
 
+    @Test
     public void testScoreDecreasesWithIncrementOfWatchedLogUpdatedTime() {
         addChannels(DEFAULT_NUMBER_OF_CHANNELS);
         addRandomWatchLogs(DEFAULT_WATCH_START_TIME_MS, DEFAULT_WATCH_END_TIME_MS,
diff --git a/tests/unit/src/com/android/tv/recommendation/RecommendationUtils.java b/tests/unit/src/com/android/tv/recommendation/RecommendationUtils.java
index 4a613995..b00ed16b 100644
--- a/tests/unit/src/com/android/tv/recommendation/RecommendationUtils.java
+++ b/tests/unit/src/com/android/tv/recommendation/RecommendationUtils.java
@@ -34,7 +34,6 @@ import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 
 public class RecommendationUtils {
-    private static final String TAG = "RecommendationUtils";
     private static final long INVALID_CHANNEL_ID = -1;
 
     /**
diff --git a/tests/unit/src/com/android/tv/recommendation/RecommenderTest.java b/tests/unit/src/com/android/tv/recommendation/RecommenderTest.java
index 5270ffce..85524a82 100644
--- a/tests/unit/src/com/android/tv/recommendation/RecommenderTest.java
+++ b/tests/unit/src/com/android/tv/recommendation/RecommenderTest.java
@@ -16,14 +16,21 @@
 
 package com.android.tv.recommendation;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
 
 import com.android.tv.data.Channel;
 import com.android.tv.recommendation.RecommendationUtils.ChannelRecordSortedMapHelper;
 import com.android.tv.testing.Utils;
 
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -34,7 +41,7 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 @SmallTest
-public class RecommenderTest extends AndroidTestCase {
+public class RecommenderTest {
     private static final int DEFAULT_NUMBER_OF_CHANNELS = 5;
     private static final long DEFAULT_WATCH_START_TIME_MS =
             System.currentTimeMillis() - TimeUnit.DAYS.toMillis(2);
@@ -72,16 +79,15 @@ public class RecommenderTest extends AndroidTestCase {
     private Channel mChannel_3;
     private Channel mChannel_4;
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setUp() {
         mChannelRecordSortedMap = new ChannelRecordSortedMapHelper(getContext());
         mDataManager = RecommendationUtils
                 .createMockRecommendationDataManager(mChannelRecordSortedMap);
         mChannelRecordSortedMap.resetRandom(Utils.createTestRandom());
     }
 
+    @Test
     public void testRecommendChannels_includeRecommendedOnly_allChannelsHaveNoScore() {
         createRecommender(true, START_DATAMANAGER_RUNNABLE_ADD_FOUR_CHANNELS);
 
@@ -94,6 +100,7 @@ public class RecommenderTest extends AndroidTestCase {
         assertEquals(0, mRecommender.recommendChannels(5).size());
     }
 
+    @Test
     public void testRecommendChannels_notIncludeRecommendedOnly_allChannelsHaveNoScore() {
         createRecommender(false, START_DATAMANAGER_RUNNABLE_ADD_FOUR_CHANNELS);
 
@@ -106,6 +113,7 @@ public class RecommenderTest extends AndroidTestCase {
         assertEquals(4, mRecommender.recommendChannels(5).size());
     }
 
+    @Test
     public void testRecommendChannels_includeRecommendedOnly_allChannelsHaveScore() {
         createRecommender(true, START_DATAMANAGER_RUNNABLE_ADD_FOUR_CHANNELS);
 
@@ -125,6 +133,7 @@ public class RecommenderTest extends AndroidTestCase {
                 mChannel_4, mChannel_3, mChannel_2, mChannel_1);
     }
 
+    @Test
     public void testRecommendChannels_notIncludeRecommendedOnly_allChannelsHaveScore() {
         createRecommender(false, START_DATAMANAGER_RUNNABLE_ADD_FOUR_CHANNELS);
 
@@ -144,6 +153,7 @@ public class RecommenderTest extends AndroidTestCase {
                 mChannel_4, mChannel_3, mChannel_2, mChannel_1);
     }
 
+    @Test
     public void testRecommendChannels_includeRecommendedOnly_fewChannelsHaveScore() {
         createRecommender(true, START_DATAMANAGER_RUNNABLE_ADD_FOUR_CHANNELS);
 
@@ -163,6 +173,7 @@ public class RecommenderTest extends AndroidTestCase {
                 mChannel_1, mChannel_2);
     }
 
+    @Test
     public void testRecommendChannels_notIncludeRecommendedOnly_fewChannelsHaveScore() {
         createRecommender(false, START_DATAMANAGER_RUNNABLE_ADD_FOUR_CHANNELS);
 
@@ -189,6 +200,7 @@ public class RecommenderTest extends AndroidTestCase {
                 mChannel_1, mChannel_2);
     }
 
+    @Test
     public void testGetChannelSortKey_recommendAllChannels() {
         createRecommender(true, START_DATAMANAGER_RUNNABLE_ADD_FOUR_CHANNELS);
 
@@ -203,6 +215,7 @@ public class RecommenderTest extends AndroidTestCase {
         assertSortKeyNotInvalid(channelList);
     }
 
+    @Test
     public void testGetChannelSortKey_recommendFewChannels() {
         // Test with recommending 3 channels.
         createRecommender(true, START_DATAMANAGER_RUNNABLE_ADD_FOUR_CHANNELS);
@@ -221,6 +234,7 @@ public class RecommenderTest extends AndroidTestCase {
         assertSortKeyNotInvalid(channelList);
     }
 
+    @Test
     public void testListener_onRecommendationChanged() {
         createRecommender(true, START_DATAMANAGER_RUNNABLE_ADD_FOUR_CHANNELS);
         // FakeEvaluator doesn't recommend a channel with empty watch log. As every channel
@@ -245,6 +259,7 @@ public class RecommenderTest extends AndroidTestCase {
         assertTrue(mOnRecommendationChanged);
     }
 
+    @Test
     public void testListener_onRecommenderReady() {
         createRecommender(true, new Runnable() {
             @Override
diff --git a/tests/unit/src/com/android/tv/recommendation/RoutineWatchEvaluatorTest.java b/tests/unit/src/com/android/tv/recommendation/RoutineWatchEvaluatorTest.java
index c9e21e9d..7b8e256d 100644
--- a/tests/unit/src/com/android/tv/recommendation/RoutineWatchEvaluatorTest.java
+++ b/tests/unit/src/com/android/tv/recommendation/RoutineWatchEvaluatorTest.java
@@ -16,12 +16,16 @@
 
 package com.android.tv.recommendation;
 
+import static org.junit.Assert.assertEquals;
+
 import android.support.test.filters.SmallTest;
 import android.test.MoreAsserts;
 
 import com.android.tv.data.Program;
 import com.android.tv.recommendation.RoutineWatchEvaluator.ProgramTime;
 
+import org.junit.Test;
+
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
@@ -61,6 +65,7 @@ public class RoutineWatchEvaluatorTest extends EvaluatorTestCase<RoutineWatchEva
         return new RoutineWatchEvaluator();
     }
 
+    @Test
     public void testSplitTextToWords() {
         assertSplitTextToWords("");
         assertSplitTextToWords("Google", "Google");
@@ -71,6 +76,7 @@ public class RoutineWatchEvaluatorTest extends EvaluatorTestCase<RoutineWatchEva
         assertSplitTextToWords("A.I.", "A.I");
     }
 
+    @Test
     public void testCalculateMaximumMatchedWordSequenceLength() {
         assertMaximumMatchedWordSequenceLength(0, "", "Google");
         assertMaximumMatchedWordSequenceLength(2, "The Big Bang Theory", "Big Bang");
@@ -82,25 +88,29 @@ public class RoutineWatchEvaluatorTest extends EvaluatorTestCase<RoutineWatchEva
         assertMaximumMatchedWordSequenceLength(0, "Dexter", "Friends");
     }
 
+    @Test
     public void testCalculateTitleMatchScore_empty() {
-        assertEquals(0.0, RoutineWatchEvaluator.calculateTitleMatchScore("", ""));
-        assertEquals(0.0, RoutineWatchEvaluator.calculateTitleMatchScore("foo", ""));
-        assertEquals(0.0, RoutineWatchEvaluator.calculateTitleMatchScore("", "foo"));
+        assertEqualScores(0.0, RoutineWatchEvaluator.calculateTitleMatchScore("", ""));
+        assertEqualScores(0.0, RoutineWatchEvaluator.calculateTitleMatchScore("foo", ""));
+        assertEqualScores(0.0, RoutineWatchEvaluator.calculateTitleMatchScore("", "foo"));
     }
 
+    @Test
     public void testCalculateTitleMatchScore_spaces() {
-        assertEquals(0.0, RoutineWatchEvaluator.calculateTitleMatchScore(" ", " "));
-        assertEquals(0.0, RoutineWatchEvaluator.calculateTitleMatchScore("foo", " "));
-        assertEquals(0.0, RoutineWatchEvaluator.calculateTitleMatchScore(" ", "foo"));
+        assertEqualScores(0.0, RoutineWatchEvaluator.calculateTitleMatchScore(" ", " "));
+        assertEqualScores(0.0, RoutineWatchEvaluator.calculateTitleMatchScore("foo", " "));
+        assertEqualScores(0.0, RoutineWatchEvaluator.calculateTitleMatchScore(" ", "foo"));
     }
 
 
+    @Test
     public void testCalculateTitleMatchScore_null() {
-        assertEquals(0.0, RoutineWatchEvaluator.calculateTitleMatchScore(null, null));
-        assertEquals(0.0, RoutineWatchEvaluator.calculateTitleMatchScore("foo", null));
-        assertEquals(0.0, RoutineWatchEvaluator.calculateTitleMatchScore(null, "foo"));
+        assertEqualScores(0.0, RoutineWatchEvaluator.calculateTitleMatchScore(null, null));
+        assertEqualScores(0.0, RoutineWatchEvaluator.calculateTitleMatchScore("foo", null));
+        assertEqualScores(0.0, RoutineWatchEvaluator.calculateTitleMatchScore(null, "foo"));
     }
 
+    @Test
     public void testCalculateTitleMatchScore_longerMatchIsBetter() {
         String base = "foo bar baz";
         assertInOrder(
@@ -110,6 +120,7 @@ public class RoutineWatchEvaluatorTest extends EvaluatorTestCase<RoutineWatchEva
                 score(base, "foo bar baz"));
     }
 
+    @Test
     public void testProgramTime_createFromProgram() {
         Calendar time = Calendar.getInstance();
         int todayDayOfWeek = time.get(Calendar.DAY_OF_WEEK);
@@ -149,6 +160,7 @@ public class RoutineWatchEvaluatorTest extends EvaluatorTestCase<RoutineWatchEva
                 programTimeToday1800_3600);
     }
 
+    @Test
     public void testCalculateOverlappedIntervalScore() {
         // Today 21:00 - 24:00.
         ProgramTime programTimeToday2100_2400 = ProgramTime.createFromProgram(
@@ -179,6 +191,7 @@ public class RoutineWatchEvaluatorTest extends EvaluatorTestCase<RoutineWatchEva
                 programTimeTomorrow2000_2300);
     }
 
+    @Test
     public void testGetTimeOfDayInSec() {
         // Time was set as 00:00:00. So, getTimeOfDay must returns 0 (= 0 * 60 * 60 + 0 * 60 + 0).
         assertEquals("TimeOfDayInSec", hourMinuteToSec(0, 0),
@@ -222,9 +235,9 @@ public class RoutineWatchEvaluatorTest extends EvaluatorTestCase<RoutineWatchEva
             score *= RoutineWatchEvaluator.MULTIPLIER_FOR_UNMATCHED_DAY_OF_WEEK;
         }
         // Two tests for testing commutative law.
-        assertEquals("OverlappedIntervalScore", score,
+        assertEqualScores("OverlappedIntervalScore", score,
                 RoutineWatchEvaluator.calculateOverlappedIntervalScore(t1, t2));
-        assertEquals("OverlappedIntervalScore", score,
+        assertEqualScores("OverlappedIntervalScore", score,
                 RoutineWatchEvaluator.calculateOverlappedIntervalScore(t2, t1));
     }
 
diff --git a/tests/unit/src/com/android/tv/search/LocalSearchProviderTest.java b/tests/unit/src/com/android/tv/search/LocalSearchProviderTest.java
new file mode 100644
index 00000000..b0d342c6
--- /dev/null
+++ b/tests/unit/src/com/android/tv/search/LocalSearchProviderTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.tv.search;
+
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static org.mockito.Mockito.clearInvocations;
+import static org.mockito.Mockito.verify;
+
+import android.app.SearchManager;
+import android.database.Cursor;
+import android.net.Uri;
+import android.support.test.filters.SmallTest;
+import android.test.ProviderTestCase2;
+
+import com.android.tv.ApplicationSingletons;
+import com.android.tv.TvApplication;
+import com.android.tv.perf.PerformanceMonitor;
+import com.android.tv.util.MockApplicationSingletons;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+/** Unit test for {@link LocalSearchProvider}. */
+@SmallTest
+public class LocalSearchProviderTest extends ProviderTestCase2<LocalSearchProvider> {
+    private static final String AUTHORITY = "com.android.tv.search";
+    private static final String KEYWORD = "keyword";
+    private static final Uri BASE_SEARCH_URI = Uri.parse("content://" + AUTHORITY + "/"
+            + SearchManager.SUGGEST_URI_PATH_QUERY + "/" + KEYWORD);
+    private static final Uri WRONG_SERACH_URI = Uri.parse("content://" + AUTHORITY + "/wrong_path/"
+            + KEYWORD);
+
+    private ApplicationSingletons mOldAppSingletons;
+    MockApplicationSingletons mMockAppSingletons;
+    @Mock PerformanceMonitor mMockPerformanceMointor;
+    @Mock SearchInterface mMockSearchInterface;
+
+    public LocalSearchProviderTest() {
+        super(LocalSearchProvider.class, AUTHORITY);
+    }
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        setContext(getTargetContext());
+        mOldAppSingletons = TvApplication.sAppSingletons;
+        mMockAppSingletons = new MockApplicationSingletons(getTargetContext());
+        mMockAppSingletons.setPerformanceMonitor(mMockPerformanceMointor);
+        TvApplication.sAppSingletons = mMockAppSingletons;
+        super.setUp();
+        getProvider().setSearchInterface(mMockSearchInterface);
+    }
+
+    @After
+    @Override
+    public void tearDown() throws Exception {
+        TvApplication.sAppSingletons = mOldAppSingletons;
+        super.tearDown();
+    }
+
+    @Test
+    public void testQuery_normalUri() {
+        verifyQueryWithArguments(null, null);
+        verifyQueryWithArguments(1, null);
+        verifyQueryWithArguments(null, 1);
+        verifyQueryWithArguments(1, 1);
+    }
+
+    @Test
+    public void testQuery_invalidUri() {
+        try (Cursor c = getProvider().query(WRONG_SERACH_URI, null, null, null, null)) {
+            fail("Query with invalid URI should fail.");
+        } catch (IllegalArgumentException e) {
+            // Success.
+        }
+    }
+
+    @Test
+    public void testQuery_invalidLimit() {
+        verifyQueryWithArguments(-1, null);
+    }
+
+    @Test
+    public void testQuery_invalidAction() {
+        verifyQueryWithArguments(null, SearchInterface.ACTION_TYPE_START - 1);
+        verifyQueryWithArguments(null, SearchInterface.ACTION_TYPE_END + 1);
+    }
+
+    private void verifyQueryWithArguments(Integer limit, Integer action) {
+        Uri uri = BASE_SEARCH_URI;
+        if (limit != null || action != null) {
+            Uri.Builder builder = uri.buildUpon();
+            if (limit != null) {
+                builder.appendQueryParameter(SearchManager.SUGGEST_PARAMETER_LIMIT,
+                        limit.toString());
+            }
+            if (action != null) {
+                builder.appendQueryParameter(LocalSearchProvider.SUGGEST_PARAMETER_ACTION,
+                        action.toString());
+            }
+            uri = builder.build();
+        }
+        try (Cursor c = getProvider().query(uri, null, null, null, null)) {
+            // Do nothing.
+        }
+        int expectedLimit = limit == null || limit <= 0 ?
+                LocalSearchProvider.DEFAULT_SEARCH_LIMIT : limit;
+        int expectedAction = (action == null || action < SearchInterface.ACTION_TYPE_START
+                || action > SearchInterface.ACTION_TYPE_END) ?
+                LocalSearchProvider.DEFAULT_SEARCH_ACTION : action;
+        verify(mMockSearchInterface).search(KEYWORD, expectedLimit, expectedAction);
+        clearInvocations(mMockSearchInterface);
+    }
+}
diff --git a/tests/unit/src/com/android/tv/tests/TvActivityTest.java b/tests/unit/src/com/android/tv/tests/TvActivityTest.java
index 3479785f..aa33f770 100644
--- a/tests/unit/src/com/android/tv/tests/TvActivityTest.java
+++ b/tests/unit/src/com/android/tv/tests/TvActivityTest.java
@@ -16,19 +16,28 @@
 
 package com.android.tv.tests;
 
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import android.support.test.filters.MediumTest;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.rule.ActivityTestRule;
 
 import com.android.tv.TvActivity;
+import com.android.tv.testing.Utils;
 
-@MediumTest
-public class TvActivityTest extends ActivityInstrumentationTestCase2<TvActivity> {
+import org.junit.Rule;
+import org.junit.Test;
 
-    public TvActivityTest() {
-        super(TvActivity.class);
-    }
+@MediumTest
+public class TvActivityTest {
+    @Rule
+    public ActivityTestRule<TvActivity> mActivityTestRule =
+            new ActivityTestRule<>(TvActivity.class, false, false);
 
+    @Test
     public void testLifeCycle() {
-        getActivity();
+        assertTrue("TvActivity should be enabled.", Utils.isTvActivityEnabled(getTargetContext()));
+        assertNotNull(mActivityTestRule.launchActivity(null));
     }
 }
diff --git a/tests/unit/src/com/android/tv/util/ImageCacheTest.java b/tests/unit/src/com/android/tv/util/ImageCacheTest.java
index e185d5f1..a76194b8 100644
--- a/tests/unit/src/com/android/tv/util/ImageCacheTest.java
+++ b/tests/unit/src/com/android/tv/util/ImageCacheTest.java
@@ -17,19 +17,21 @@
 package com.android.tv.util;
 
 import static com.android.tv.util.BitmapUtils.createScaledBitmapInfo;
+import static org.junit.Assert.assertSame;
 
 import android.graphics.Bitmap;
 import android.support.test.filters.MediumTest;
 
 import com.android.tv.util.BitmapUtils.ScaledBitmapInfo;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * Tests for {@link ImageCache}.
  */
 @MediumTest
-public class ImageCacheTest extends TestCase {
+public class ImageCacheTest {
     private static final Bitmap ORIG = Bitmap.createBitmap(100, 100, Bitmap.Config.RGB_565);
 
     private static final String KEY = "same";
@@ -40,14 +42,14 @@ public class ImageCacheTest extends TestCase {
 
     private ImageCache mImageCache;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         mImageCache = ImageCache.newInstance(0.1f);
     }
 
     //TODO: Empty the cache in the setup.  Try using @VisibleForTesting
 
+    @Test
     public void testPutIfLarger_smaller() throws Exception {
 
         mImageCache.putIfNeeded( INFO_50);
@@ -57,6 +59,7 @@ public class ImageCacheTest extends TestCase {
         assertSame("after", INFO_50, mImageCache.get(KEY));
     }
 
+    @Test
     public void testPutIfLarger_larger() throws Exception {
         mImageCache.putIfNeeded( INFO_50);
         assertSame("before", INFO_50, mImageCache.get(KEY));
@@ -65,6 +68,7 @@ public class ImageCacheTest extends TestCase {
         assertSame("after", INFO_100, mImageCache.get(KEY));
     }
 
+    @Test
     public void testPutIfLarger_alreadyMax() throws Exception {
 
         mImageCache.putIfNeeded( INFO_100);
diff --git a/tests/unit/src/com/android/tv/util/MockApplicationSingletons.java b/tests/unit/src/com/android/tv/util/MockApplicationSingletons.java
new file mode 100644
index 00000000..4cfc7f8a
--- /dev/null
+++ b/tests/unit/src/com/android/tv/util/MockApplicationSingletons.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.tv.util;
+
+import android.content.Context;
+
+import com.android.tv.ApplicationSingletons;
+import com.android.tv.InputSessionManager;
+import com.android.tv.MainActivityWrapper;
+import com.android.tv.TvApplication;
+import com.android.tv.analytics.Analytics;
+import com.android.tv.analytics.Tracker;
+import com.android.tv.config.RemoteConfig;
+import com.android.tv.data.ChannelDataManager;
+import com.android.tv.data.PreviewDataManager;
+import com.android.tv.data.ProgramDataManager;
+import com.android.tv.dvr.DvrDataManager;
+import com.android.tv.dvr.DvrManager;
+import com.android.tv.dvr.DvrScheduleManager;
+import com.android.tv.dvr.DvrStorageStatusManager;
+import com.android.tv.dvr.DvrWatchedPositionManager;
+import com.android.tv.dvr.recorder.RecordingScheduler;
+import com.android.tv.perf.PerformanceMonitor;
+
+/**
+ * Mock {@link ApplicationSingletons} class.
+ */
+public class MockApplicationSingletons implements ApplicationSingletons {
+    private final TvApplication mApp;
+
+    private PerformanceMonitor mPerformanceMonitor;
+
+    public MockApplicationSingletons(Context context) {
+        mApp = (TvApplication) context.getApplicationContext();
+    }
+
+    @Override
+    public Analytics getAnalytics() {
+        return mApp.getAnalytics();
+    }
+
+    @Override
+    public ChannelDataManager getChannelDataManager() {
+        return mApp.getChannelDataManager();
+    }
+
+    @Override
+    public boolean isChannelDataManagerLoadFinished() {
+        return mApp.isChannelDataManagerLoadFinished();
+    }
+
+    @Override
+    public ProgramDataManager getProgramDataManager() {
+        return mApp.getProgramDataManager();
+    }
+
+    @Override
+    public boolean isProgramDataManagerCurrentProgramsLoadFinished() {
+        return mApp.isProgramDataManagerCurrentProgramsLoadFinished();
+    }
+
+    @Override
+    public PreviewDataManager getPreviewDataManager() {
+        return mApp.getPreviewDataManager();
+    }
+
+    @Override
+    public DvrDataManager getDvrDataManager() {
+        return mApp.getDvrDataManager();
+    }
+
+    @Override
+    public DvrStorageStatusManager getDvrStorageStatusManager() {
+        return mApp.getDvrStorageStatusManager();
+    }
+
+    @Override
+    public DvrScheduleManager getDvrScheduleManager() {
+        return mApp.getDvrScheduleManager();
+    }
+
+    @Override
+    public DvrManager getDvrManager() {
+        return mApp.getDvrManager();
+    }
+
+    @Override
+    public RecordingScheduler getRecordingScheduler() {
+        return mApp.getRecordingScheduler();
+    }
+
+    @Override
+    public DvrWatchedPositionManager getDvrWatchedPositionManager() {
+        return mApp.getDvrWatchedPositionManager();
+    }
+
+    @Override
+    public InputSessionManager getInputSessionManager() {
+        return mApp.getInputSessionManager();
+    }
+
+    @Override
+    public Tracker getTracker() {
+        return mApp.getTracker();
+    }
+
+    @Override
+    public TvInputManagerHelper getTvInputManagerHelper() {
+        return mApp.getTvInputManagerHelper();
+    }
+
+    @Override
+    public MainActivityWrapper getMainActivityWrapper() {
+        return mApp.getMainActivityWrapper();
+    }
+
+    @Override
+    public AccountHelper getAccountHelper() {
+        return mApp.getAccountHelper();
+    }
+
+    @Override
+    public RemoteConfig getRemoteConfig() {
+        return mApp.getRemoteConfig();
+    }
+
+    @Override
+    public boolean isRunningInMainProcess() {
+        return mApp.isRunningInMainProcess();
+    }
+
+    @Override
+    public PerformanceMonitor getPerformanceMonitor() {
+        return mPerformanceMonitor != null ? mPerformanceMonitor : mApp.getPerformanceMonitor();
+    }
+
+    public void setPerformanceMonitor(PerformanceMonitor performanceMonitor) {
+        mPerformanceMonitor = performanceMonitor;
+    }
+}
diff --git a/tests/unit/src/com/android/tv/util/MultiLongSparseArrayTest.java b/tests/unit/src/com/android/tv/util/MultiLongSparseArrayTest.java
index fe094fb3..7335f207 100644
--- a/tests/unit/src/com/android/tv/util/MultiLongSparseArrayTest.java
+++ b/tests/unit/src/com/android/tv/util/MultiLongSparseArrayTest.java
@@ -16,10 +16,13 @@
 
 package com.android.tv.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
 import android.support.test.filters.SmallTest;
 import android.test.MoreAsserts;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import java.util.Collections;
 
@@ -27,19 +30,21 @@ import java.util.Collections;
  * Tests for {@link MultiLongSparseArray}.
  */
 @SmallTest
-public class MultiLongSparseArrayTest extends TestCase {
-
+public class MultiLongSparseArrayTest {
+    @Test
     public void testEmpty() {
         MultiLongSparseArray<String> sparseArray = new MultiLongSparseArray<>();
         assertSame(Collections.EMPTY_SET, sparseArray.get(0));
     }
 
+    @Test
     public void testOneElement() {
         MultiLongSparseArray<String> sparseArray = new MultiLongSparseArray<>();
         sparseArray.put(0, "foo");
         MoreAsserts.assertContentsInAnyOrder(sparseArray.get(0), "foo");
     }
 
+    @Test
     public void testTwoElements() {
         MultiLongSparseArray<String> sparseArray = new MultiLongSparseArray<>();
         sparseArray.put(0, "foo");
@@ -48,6 +53,7 @@ public class MultiLongSparseArrayTest extends TestCase {
     }
 
 
+    @Test
     public void testClearEmptyCache() {
         MultiLongSparseArray<String> sparseArray = new MultiLongSparseArray<>();
         sparseArray.clearEmptyCache();
@@ -59,6 +65,7 @@ public class MultiLongSparseArrayTest extends TestCase {
         assertEquals(0, sparseArray.getEmptyCacheSize());
     }
 
+    @Test
     public void testMaxEmptyCacheSize() {
         MultiLongSparseArray<String> sparseArray = new MultiLongSparseArray<>();
         sparseArray.clearEmptyCache();
@@ -75,6 +82,7 @@ public class MultiLongSparseArrayTest extends TestCase {
         assertEquals(0, sparseArray.getEmptyCacheSize());
     }
 
+    @Test
     public void testReuseEmptySets() {
         MultiLongSparseArray<String> sparseArray = new MultiLongSparseArray<>();
         sparseArray.clearEmptyCache();
diff --git a/tests/unit/src/com/android/tv/util/ScaledBitmapInfoTest.java b/tests/unit/src/com/android/tv/util/ScaledBitmapInfoTest.java
index 36d25a10..2714e2e9 100644
--- a/tests/unit/src/com/android/tv/util/ScaledBitmapInfoTest.java
+++ b/tests/unit/src/com/android/tv/util/ScaledBitmapInfoTest.java
@@ -1,24 +1,29 @@
 package com.android.tv.util;
 
+import static org.junit.Assert.assertEquals;
+
 import android.graphics.Bitmap;
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 
 import com.android.tv.util.BitmapUtils.ScaledBitmapInfo;
 
+import org.junit.Test;
+
 /**
  * Tests for {@link ScaledBitmapInfo}.
  */
 @SmallTest
-public class ScaledBitmapInfoTest extends AndroidTestCase {
+public class ScaledBitmapInfoTest {
     private static final Bitmap B80x100 = Bitmap.createBitmap(80, 100, Bitmap.Config.RGB_565);
     private static final Bitmap B960x1440 = Bitmap.createBitmap(960, 1440, Bitmap.Config.RGB_565);
 
+    @Test
     public void testSize_B100x100to50x50() {
         ScaledBitmapInfo actual = BitmapUtils.createScaledBitmapInfo("B80x100", B80x100, 50, 50);
         assertScaledBitmapSize(2, 40, 50, actual);
     }
 
+    @Test
     public void testNeedsToReload_B100x100to50x50() {
         ScaledBitmapInfo actual = BitmapUtils.createScaledBitmapInfo("B80x100", B80x100, 50, 50);
         assertNeedsToReload(false, actual, 25, 25);
@@ -31,6 +36,7 @@ public class ScaledBitmapInfoTest extends AndroidTestCase {
     /**
      * Reproduces <a href="http://b/20488453">b/20488453</a>.
      */
+    @Test
     public void testBug20488453() {
         ScaledBitmapInfo actual = BitmapUtils
                 .createScaledBitmapInfo("B960x1440", B960x1440, 284, 160);
diff --git a/tests/unit/src/com/android/tv/util/TestUtils.java b/tests/unit/src/com/android/tv/util/TestUtils.java
index e3bda138..d200733d 100644
--- a/tests/unit/src/com/android/tv/util/TestUtils.java
+++ b/tests/unit/src/com/android/tv/util/TestUtils.java
@@ -21,8 +21,8 @@ import android.content.pm.ServiceInfo;
 import android.graphics.drawable.Icon;
 import android.hardware.hdmi.HdmiDeviceInfo;
 import android.media.tv.TvInputInfo;
+import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.os.BuildCompat;
 
 import java.lang.reflect.Constructor;
 
@@ -47,7 +47,11 @@ public class TestUtils {
             int type, boolean isHardwareInput, boolean canRecord, int tunerCount) throws Exception {
         // Create a mock TvInputInfo by using private constructor
         // Note that mockito doesn't support mock/spy on final object.
-        if (BuildCompat.isAtLeastN()) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            return createTvInputInfoForO(service, id, parentId, type, isHardwareInput, canRecord,
+                    tunerCount);
+
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             return createTvInputInfoForNyc(service, id, parentId, type, isHardwareInput, canRecord,
                     tunerCount);
         }
@@ -57,6 +61,24 @@ public class TestUtils {
     /**
      * private TvInputInfo(ResolveInfo service, String id, int type, boolean isHardwareInput,
      *      CharSequence label, int labelResId, Icon icon, Icon iconStandby, Icon iconDisconnected,
+     *      String setupActivity, boolean canRecord, int tunerCount, HdmiDeviceInfo hdmiDeviceInfo,
+     *      boolean isConnectedToHdmiSwitch, String parentId, Bundle extras) {
+     */
+    private static TvInputInfo createTvInputInfoForO(ResolveInfo service, String id,
+            String parentId, int type, boolean isHardwareInput, boolean canRecord, int tunerCount)
+            throws Exception {
+        Constructor<TvInputInfo> constructor = TvInputInfo.class.getDeclaredConstructor(
+                ResolveInfo.class, String.class, int.class, boolean.class, CharSequence.class,
+                int.class, Icon.class, Icon.class, Icon.class, String.class, boolean.class,
+                int.class, HdmiDeviceInfo.class, boolean.class, String.class, Bundle.class);
+        constructor.setAccessible(true);
+        return constructor.newInstance(service, id, type, isHardwareInput, null, 0, null, null,
+                null, null, canRecord, tunerCount, null, false, parentId, null);
+    }
+
+    /**
+     * private TvInputInfo(ResolveInfo service, String id, int type, boolean isHardwareInput,
+     *      CharSequence label, int labelResId, Icon icon, Icon iconStandby, Icon iconDisconnected,
      *      String setupActivity, String settingsActivity, boolean canRecord, int tunerCount,
      *      HdmiDeviceInfo hdmiDeviceInfo, boolean isConnectedToHdmiSwitch, String parentId,
      *      Bundle extras) {
@@ -87,6 +109,7 @@ public class TestUtils {
         resolveInfo.serviceInfo = new ServiceInfo();
         resolveInfo.serviceInfo.packageName = packageName;
         resolveInfo.serviceInfo.name = name;
+        resolveInfo.serviceInfo.metaData = new Bundle();
         return resolveInfo;
     }
 }
diff --git a/tests/unit/src/com/android/tv/util/TvInputManagerHelperTest.java b/tests/unit/src/com/android/tv/util/TvInputManagerHelperTest.java
index ba1e0b0b..404ee5d3 100644
--- a/tests/unit/src/com/android/tv/util/TvInputManagerHelperTest.java
+++ b/tests/unit/src/com/android/tv/util/TvInputManagerHelperTest.java
@@ -16,58 +16,155 @@
 
 package com.android.tv.util;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+
 import android.content.pm.ResolveInfo;
 import android.media.tv.TvInputInfo;
 import android.support.test.filters.SmallTest;
-import android.support.test.filters.Suppress;
-import android.test.AndroidTestCase;
 
 import com.android.tv.testing.ComparatorTester;
 
+import org.junit.Test;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import java.util.LinkedHashMap;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * Test for {@link TvInputManagerHelper}
  */
 @SmallTest
-public class TvInputManagerHelperTest extends AndroidTestCase {
-    public void testComparator() throws Exception {
-        final LinkedHashMap<String, Boolean> INPUT_ID_TO_PARTNER_INPUT = new LinkedHashMap<>();
-        INPUT_ID_TO_PARTNER_INPUT.put("2_partner_input", true);
-        INPUT_ID_TO_PARTNER_INPUT.put("3_partner_input", true);
-        INPUT_ID_TO_PARTNER_INPUT.put("1_3rd_party_input", false);
-        INPUT_ID_TO_PARTNER_INPUT.put("4_3rd_party_input", false);
+public class TvInputManagerHelperTest {
+    final HashMap<String, TvInputInfoWrapper> TEST_INPUT_MAP = new HashMap<>();
+
+    @Test
+    public void testComparatorInternal() {
+        ResolveInfo resolveInfo = TestUtils.createResolveInfo("test", "test");
+
+        List<TvInputInfo> inputs = new ArrayList<>();
+        inputs.add(createTvInputInfo(resolveInfo, "2_partner_input", null, 0, false,
+                "2_partner_input", null, true));
+        inputs.add(createTvInputInfo(resolveInfo, "3_partner_input", null, 0, false,
+                "3_partner_input", null, true));
+        inputs.add(createTvInputInfo(resolveInfo, "1_3rd_party_input", null, 0, false,
+                "1_3rd_party_input", null, false));
+        inputs.add(createTvInputInfo(resolveInfo, "4_3rd_party_input", null, 0, false,
+                "4_3rd_party_input", null, false));
+
+        TvInputManagerHelper manager = createMockTvInputManager();
+
+        ComparatorTester<TvInputInfo> comparatorTester = ComparatorTester.withoutEqualsTest(
+                        new TvInputManagerHelper.InputComparatorInternal(manager));
+        for (TvInputInfo input : inputs) {
+            comparatorTester.addComparableGroup(input);
+        }
+        comparatorTester.test();
+    }
+
+    @Test
+    public void testHardwareInputComparatorHdmi() {
+        ResolveInfo resolveInfo = TestUtils.createResolveInfo("test", "test");
+
+        TvInputInfo hdmi1 = createTvInputInfo(resolveInfo, "HDMI1", null, TvInputInfo.TYPE_HDMI,
+                true, "HDMI1", null, false);
+        TvInputInfo hdmi2 = createTvInputInfo(resolveInfo, "HDMI2", null, TvInputInfo.TYPE_HDMI,
+                true, "HDMI2", "DVD", false);
+        TvInputInfo hdmi3 = createTvInputInfo(resolveInfo, "HDMI3", null, TvInputInfo.TYPE_HDMI,
+                true, "HDMI3", "Cable", false);
+        TvInputInfo hdmi4 = createTvInputInfo(resolveInfo, "HDMI4", null, TvInputInfo.TYPE_HDMI,
+                true, "HDMI4", null, false);
+
+        TvInputManagerHelper manager = createMockTvInputManager();
+
+        ComparatorTester<TvInputInfo> comparatorTester = ComparatorTester.withoutEqualsTest(
+                        new TvInputManagerHelper.HardwareInputComparator(getContext(), manager));
+        comparatorTester.addComparableGroup(hdmi3)
+                .addComparableGroup(hdmi2)
+                .addComparableGroup(hdmi1)
+                .addComparableGroup(hdmi4)
+                .test();
+    }
+
+    @Test
+    public void testHardwareInputComparatorCec() {
+        ResolveInfo resolveInfo = TestUtils.createResolveInfo("test", "test");
+
+        TvInputInfo hdmi1 = createTvInputInfo(resolveInfo, "HDMI1", null, TvInputInfo.TYPE_HDMI,
+                true, "HDMI1", null, false);
+        TvInputInfo hdmi2 = createTvInputInfo(resolveInfo, "HDMI2", null, TvInputInfo.TYPE_HDMI,
+                true, "HDMI2", null, false);
 
+        TvInputInfo cec1 = createTvInputInfo(resolveInfo, "2_cec", "HDMI1", TvInputInfo.TYPE_HDMI,
+                true, "2_cec", null, false);
+        TvInputInfo cec2 = createTvInputInfo(resolveInfo, "1_cec", "HDMI2", TvInputInfo.TYPE_HDMI,
+                true, "1_cec", null, false);
+
+        TvInputManagerHelper manager = createMockTvInputManager();
+
+        ComparatorTester<TvInputInfo> comparatorTester = ComparatorTester.withoutEqualsTest(
+                        new TvInputManagerHelper.HardwareInputComparator(getContext(), manager));
+        comparatorTester.addComparableGroup(cec1)
+                .addComparableGroup(cec2)
+                .test();
+    }
+
+    private TvInputManagerHelper createMockTvInputManager() {
         TvInputManagerHelper manager = Mockito.mock(TvInputManagerHelper.class);
         Mockito.doAnswer(new Answer<Boolean>() {
             @Override
             public Boolean answer(InvocationOnMock invocation) throws Throwable {
                 TvInputInfo info = (TvInputInfo) invocation.getArguments()[0];
-                return INPUT_ID_TO_PARTNER_INPUT.get(info.getId());
+                return TEST_INPUT_MAP.get(info.getId()).mIsPartnerInput;
             }
         }).when(manager).isPartnerInput(Mockito.<TvInputInfo>any());
         Mockito.doAnswer(new Answer<String>() {
             @Override
             public String answer(InvocationOnMock invocation) throws Throwable {
                 TvInputInfo info = (TvInputInfo) invocation.getArguments()[0];
-                return info.getId();
+                return TEST_INPUT_MAP.get(info.getId()).mLabel;
             }
         }).when(manager).loadLabel(Mockito.<TvInputInfo>any());
+        Mockito.doAnswer(new Answer<String>() {
+            @Override
+            public String answer(InvocationOnMock invocation) throws Throwable {
+                TvInputInfo info = (TvInputInfo) invocation.getArguments()[0];
+                return TEST_INPUT_MAP.get(info.getId()).mCustomLabel;
+            }
+        }).when(manager).loadCustomLabel(Mockito.<TvInputInfo>any());
+        Mockito.doAnswer(new Answer<TvInputInfo>() {
+            @Override
+            public TvInputInfo answer(InvocationOnMock invocation) throws Throwable {
+                String inputId = (String) invocation.getArguments()[0];
+                TvInputInfoWrapper inputWrapper = TEST_INPUT_MAP.get(inputId);
+                return inputWrapper == null ? null : inputWrapper.mInput;
+            }
+        }).when(manager).getTvInputInfo(Mockito.<String>any());
+        return manager;
+    }
 
-        ComparatorTester<TvInputInfo> comparatorTester =
-                ComparatorTester.withoutEqualsTest(
-                        new TvInputManagerHelper.TvInputInfoComparator(manager));
-        ResolveInfo resolveInfo1 = TestUtils.createResolveInfo("1_test", "1_test");
-        ResolveInfo resolveInfo2 = TestUtils.createResolveInfo("2_test", "2_test");
-        for (String inputId : INPUT_ID_TO_PARTNER_INPUT.keySet()) {
-            TvInputInfo info1 = TestUtils.createTvInputInfo(resolveInfo1, inputId, null, 0, false);
-            TvInputInfo info2 = TestUtils.createTvInputInfo(resolveInfo2, inputId, null, 0, false);
-            comparatorTester.addComparableGroup(info1, info2);
+    private TvInputInfo createTvInputInfo(ResolveInfo service, String id,
+            String parentId, int type, boolean isHardwareInput, String label, String customLabel,
+            boolean isPartnerInput) {
+        TvInputInfoWrapper inputWrapper = new TvInputInfoWrapper();
+        try {
+            inputWrapper.mInput =
+                    TestUtils.createTvInputInfo(service, id, parentId, type, isHardwareInput);
+        } catch (Exception e) {
         }
-        comparatorTester.test();
+        inputWrapper.mLabel = label;
+        inputWrapper.mIsPartnerInput = isPartnerInput;
+        inputWrapper.mCustomLabel = customLabel;
+        TEST_INPUT_MAP.put(id, inputWrapper);
+        return inputWrapper.mInput;
+    }
+
+    private static class TvInputInfoWrapper {
+        TvInputInfo mInput;
+        String mLabel;
+        String mCustomLabel;
+        boolean mIsPartnerInput;
     }
 }
diff --git a/tests/unit/src/com/android/tv/util/TvTrackInfoUtilsTest.java b/tests/unit/src/com/android/tv/util/TvTrackInfoUtilsTest.java
index 9600fc0b..4512bb7d 100644
--- a/tests/unit/src/com/android/tv/util/TvTrackInfoUtilsTest.java
+++ b/tests/unit/src/com/android/tv/util/TvTrackInfoUtilsTest.java
@@ -16,13 +16,14 @@
 package com.android.tv.util;
 
 import static com.android.tv.util.TvTrackInfoUtils.getBestTrackInfo;
+import static org.junit.Assert.assertEquals;
 
 import android.media.tv.TvTrackInfo;
 import android.support.test.filters.SmallTest;
 
 import com.android.tv.testing.ComparatorTester;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -33,8 +34,7 @@ import java.util.List;
  * Tests for {@link com.android.tv.util.TvTrackInfoUtils}.
  */
 @SmallTest
-public class TvTrackInfoUtilsTest extends TestCase {
-
+public class TvTrackInfoUtilsTest {
     private static final String UN_MATCHED_ID = "no matching ID";
 
     private static final TvTrackInfo INFO_1_EN_1 = create("1", "en", 1);
@@ -59,46 +59,55 @@ public class TvTrackInfoUtilsTest extends TestCase {
     private static final List<TvTrackInfo> NULL_LANGUAGE_TRACKS = Arrays.asList(INFO_4_NULL_2,
             INFO_5_NULL_6);
 
+    @Test
     public void testGetBestTrackInfo_empty() {
         TvTrackInfo result = getBestTrackInfo(Collections.emptyList(), UN_MATCHED_ID, "en", 1);
         assertEquals("best track ", null, result);
     }
 
+    @Test
     public void testGetBestTrackInfo_exactMatch() {
         TvTrackInfo result = getBestTrackInfo(ALL, "1", "en", 1);
         assertEquals("best track ", INFO_1_EN_1, result);
     }
 
+    @Test
     public void testGetBestTrackInfo_langAndChannelCountMatch() {
         TvTrackInfo result = getBestTrackInfo(ALL, UN_MATCHED_ID, "en", 5);
         assertEquals("best track ", INFO_2_EN_5, result);
     }
 
+    @Test
     public void testGetBestTrackInfo_languageOnlyMatch() {
         TvTrackInfo result = getBestTrackInfo(ALL, UN_MATCHED_ID, "fr", 1);
         assertEquals("best track ", INFO_3_FR_8, result);
     }
 
+    @Test
     public void testGetBestTrackInfo_channelCountOnlyMatchWithNullLanguage() {
         TvTrackInfo result = getBestTrackInfo(ALL, UN_MATCHED_ID, null, 8);
         assertEquals("best track ", INFO_3_FR_8, result);
     }
 
+    @Test
     public void testGetBestTrackInfo_noMatches() {
         TvTrackInfo result = getBestTrackInfo(ALL, UN_MATCHED_ID, "kr", 1);
         assertEquals("best track ", INFO_1_EN_1, result);
     }
 
+    @Test
     public void testGetBestTrackInfo_noMatchesWithNullLanguage() {
         TvTrackInfo result = getBestTrackInfo(ALL, UN_MATCHED_ID, null, 0);
         assertEquals("best track ", INFO_1_EN_1, result);
     }
 
+    @Test
     public void testGetBestTrackInfo_channelCountAndIdMatch() {
         TvTrackInfo result = getBestTrackInfo(NULL_LANGUAGE_TRACKS, "5", null, 6);
         assertEquals("best track ", INFO_5_NULL_6, result);
     }
 
+    @Test
     public void testComparator() {
         Comparator<TvTrackInfo> comparator = TvTrackInfoUtils.createComparator("1", "en", 1);
         ComparatorTester.withoutEqualsTest(comparator)
diff --git a/tests/unit/src/com/android/tv/util/UtilsTest_GetDurationString.java b/tests/unit/src/com/android/tv/util/UtilsTest_GetDurationString.java
index 9dfb992e..e61802f5 100644
--- a/tests/unit/src/com/android/tv/util/UtilsTest_GetDurationString.java
+++ b/tests/unit/src/com/android/tv/util/UtilsTest_GetDurationString.java
@@ -15,10 +15,16 @@
  */
 package com.android.tv.util;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
+
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 import android.text.format.DateUtils;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Locale;
@@ -32,7 +38,7 @@ import java.util.Locale;
  * and it should be defined in TV app, not this test.
  */
 @SmallTest
-public class UtilsTest_GetDurationString extends AndroidTestCase {
+public class UtilsTest_GetDurationString {
     // TODO: Mock Context so we can specify current time and locale for test.
     private Locale mLocale;
     private static final long DATE_THIS_YEAR_2_1_MS = getFebOfThisYearInMillis(1, 0, 0);
@@ -40,14 +46,19 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
     // All possible list for a parameter to test parameter independent result.
     private static final boolean[] PARAM_USE_SHORT_FORMAT = {false, true};
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         // Set locale to US
         mLocale = Locale.getDefault();
         Locale.setDefault(Locale.US);
     }
 
+    @After
+    public void tearDown() {
+        // Revive system locale.
+        Locale.setDefault(mLocale);
+    }
+
     /**
      * Return time in millis assuming that whose year is this year and month is Jan.
      */
@@ -76,6 +87,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
         return new GregorianCalendar().get(GregorianCalendar.YEAR);
     }
 
+    @Test
     public void testSameDateAndTime() {
         assertEquals("3:00 AM", Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS,
                         getFebOfThisYearInMillis(1, 3), getFebOfThisYearInMillis(1, 3), false,
@@ -85,6 +97,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testDurationWithinToday() {
         assertEquals("12:00 – 3:00 AM",
                 Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS, DATE_THIS_YEAR_2_1_MS,
@@ -96,6 +109,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testDurationFromYesterdayToToday() {
         assertEquals("Jan 31, 3:00 AM – Feb 1, 4:00 AM",
                 Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS,
@@ -115,6 +129,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         true, DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testDurationFromTodayToTomorrow() {
         assertEquals("Feb 1, 3:00 AM – Feb 2, 4:00 AM",
                 Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS,
@@ -154,6 +169,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testDurationWithinTomorrow() {
         assertEquals("Feb 2, 2:00 – 4:00 AM",
                 Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS,
@@ -173,6 +189,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testStartOfDay() {
         assertEquals("12:00 – 1:00 AM",
                 Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS, DATE_THIS_YEAR_2_1_MS,
@@ -201,6 +218,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testEndOfDay() {
         for (boolean useShortFormat : PARAM_USE_SHORT_FORMAT) {
             assertEquals("11:00 PM – 12:00 AM",
@@ -241,6 +259,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testMidnight() {
         for (boolean useShortFormat : PARAM_USE_SHORT_FORMAT) {
             assertEquals("12:00 AM", Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS,
@@ -251,11 +270,4 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                             DateUtils.FORMAT_24HOUR));
         }
     }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        // Revive system locale.
-        Locale.setDefault(mLocale);
-    }
 }
diff --git a/tests/unit/src/com/android/tv/util/UtilsTest_GetMultiAudioString.java b/tests/unit/src/com/android/tv/util/UtilsTest_GetMultiAudioString.java
index 8a6f3e3b..1e75342b 100644
--- a/tests/unit/src/com/android/tv/util/UtilsTest_GetMultiAudioString.java
+++ b/tests/unit/src/com/android/tv/util/UtilsTest_GetMultiAudioString.java
@@ -16,21 +16,26 @@
 
 package com.android.tv.util;
 
+import static android.support.test.InstrumentationRegistry.getTargetContext;
+import static org.junit.Assert.assertEquals;
+
 import android.content.Context;
 import android.media.tv.TvTrackInfo;
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
+
+import org.junit.Test;
 
 /**
  * Tests for {@link com.android.tv.util.Utils#getMultiAudioString}.
  */
 @SmallTest
-public class UtilsTest_GetMultiAudioString extends AndroidTestCase {
+public class UtilsTest_GetMultiAudioString {
     private static final String TRACK_ID = "test_track_id";
     private static final int AUDIO_SAMPLE_RATE = 48000;
 
+    @Test
     public void testAudioTrackLanguage() {
-        Context context = getContext();
+        Context context = getTargetContext();
         assertEquals("Korean",
                 Utils.getMultiAudioString(context, createAudioTrackInfo("kor"), false));
         assertEquals("English",
@@ -42,8 +47,9 @@ public class UtilsTest_GetMultiAudioString extends AndroidTestCase {
         assertEquals("abc", Utils.getMultiAudioString(context, createAudioTrackInfo("abc"), false));
     }
 
+    @Test
     public void testAudioTrackCount() {
-        Context context = getContext();
+        Context context = getTargetContext();
         assertEquals("English",
                 Utils.getMultiAudioString(context, createAudioTrackInfo("eng", -1), false));
         assertEquals("English",
@@ -66,11 +72,14 @@ public class UtilsTest_GetMultiAudioString extends AndroidTestCase {
                 Utils.getMultiAudioString(context, createAudioTrackInfo("eng", 8), false));
     }
 
+    @Test
     public void testShowSampleRate() {
         assertEquals("Korean (48kHz)",
-                Utils.getMultiAudioString(getContext(), createAudioTrackInfo("kor", 0), true));
+                Utils.getMultiAudioString(getTargetContext(),
+                createAudioTrackInfo("kor", 0), true));
         assertEquals("Korean (7.1 surround, 48kHz)",
-                Utils.getMultiAudioString(getContext(), createAudioTrackInfo("kor", 8), true));
+                Utils.getMultiAudioString(getTargetContext(),
+                createAudioTrackInfo("kor", 8), true));
     }
 
     private static TvTrackInfo createAudioTrackInfo(String language) {
diff --git a/tests/unit/src/com/android/tv/util/UtilsTest_IsInGivenDay.java b/tests/unit/src/com/android/tv/util/UtilsTest_IsInGivenDay.java
index 926deb07..2b43abc1 100644
--- a/tests/unit/src/com/android/tv/util/UtilsTest_IsInGivenDay.java
+++ b/tests/unit/src/com/android/tv/util/UtilsTest_IsInGivenDay.java
@@ -16,8 +16,12 @@
 
 package com.android.tv.util;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
+
+import org.junit.Test;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -27,19 +31,22 @@ import java.util.TimeZone;
  * Tests for {@link com.android.tv.util.Utils#isInGivenDay}.
  */
 @SmallTest
-public class UtilsTest_IsInGivenDay extends AndroidTestCase {
+public class UtilsTest_IsInGivenDay {
+    @Test
     public void testIsInGivenDay() {
         assertTrue(Utils.isInGivenDay(
                 new GregorianCalendar(2015, Calendar.JANUARY, 1).getTimeInMillis(),
                 new GregorianCalendar(2015, Calendar.JANUARY, 1, 0, 30).getTimeInMillis()));
     }
 
+    @Test
     public void testIsNotInGivenDay() {
         assertFalse(Utils.isInGivenDay(
                 new GregorianCalendar(2015, Calendar.JANUARY, 1).getTimeInMillis(),
                 new GregorianCalendar(2015, Calendar.JANUARY, 2).getTimeInMillis()));
     }
 
+    @Test
     public void testIfTimeZoneApplied() {
         TimeZone timeZone = TimeZone.getDefault();