Revert "Add more versions for tests"

This reverts commit 35c0c81766563cb190a195b56c1adee967f3b71e.
Revert "Revert "Add more versions for tests""

This reverts commit f96d5e44d3e0f54eabfa8ca98a4ed899c5f5282a.