completed sorting exercise, refactored several methods, renumbered tests