Refactored to use worker verticle plus more tests