Reorder/rename some unit tests for readability