Change order of sections in tests to improve readability