Reorder tests, rename file.  No substantive changes in this commit.