754.cycling section order bug

Fixes #754.

Note the new battery test will fail until #753 is merged (and updated to this branch).