Adjust for async listen
Add mod-test dir