Converting half the tests to a new main.