Review: Improved test method order and formatting