Various
Make the test run
Misc
Redundant Sort and Contains helpers

Just use Linq