Use underscore, add test, dispatch hash into other TS files