Fixed test
(cherry picked from commit 7cbde15)
Fixed tests
(cherry picked from commit 38c672a)
Fixed tests
(cherry picked from commit 1af4c79)
Fixed tests
(cherry picked from commit 7dc4afd)
Fixed tests
(cherry picked from commit 4a35f78)