Cleaned up test system, renamed hash tables