Feature test name rehash.
Refactor map insertion codes.