Correct header inclusion.
Speed up tests by using smaller hash tables.