Add more tests, change utils.dispatch.