Fixed tests for differentiated adapters

(cherry picked from commit 145fc9474730fe1e169823508a2b44c48850c5cd)
(cherry picked from commit cd5b3ecff44b419661bd6ffacbed26131b0bcf3d)
(cherry picked from commit e1f89a675e6a96416e3057f87e3ee91dba89913d)