reordered fields for better alignment in test