Fixed tests
(cherry picked from commit cb2f8ab)