Smal refactoring. Fixed vertx module failing tests