Remove unneeded includes
Do not sort results of WordDB, simplify code
Tweak test run script