Fixing number of tests
(cherry picked from commit 4836d87e1cf8854258307b4c1a75ae40ed278822)