test: create correct handler

TODO: It should be cleaned up.