Reordered the tests suite to fix some problems.

Some of the new tests added recently where in the wrong place in the run order, moved them so that the suite works better.