Moved some tests around to match the layout in n4023. No functionality change, or change to the tests, either.