Changed the approach to doing the tests.

So I have tests V2, where I can switch back to the old version if
needed.