fixed bug in deck-sorter and started fixing tests (again, again)