Fix member ordering

[adamralph]

No description provided.

[sungam3r]

Interesting attention to detail 👍

[adamralph]

@danielmarbach I realised that having static and instance members jumbled together isn't great either, so I pushed fixup commits to alter the tests and implementation to ensure statics come after instance members. I guess my (slight) preference may be to have statics before instance members, but we'd have to alter some more existing tests before making that change.

[danielmarbach]

Honestly I prefer consistency over any member ordering preferences. As long as we have a stable way to sort things we are good and I would try to avoid to go to far into any directions of "I like it this way" because then someone else will come and say "but this other way is much better".