Improve some test ordering

Spotted by Daniel Marjamäki, thanks.