Converting half the tests to a new main.
Second part of tes conversion.
Merge branch 'master' into resharding
Removinng unused function.