Improve readability by reordering test data
Refactor tests according to Will's comments

* Rewrite several docstrings and method names
* Remove extaneous comments
* Remove sorting - data should be sorted by default
* As a result, refactor the expected order of most test data