Rename and reorder tests
Document!