Refactor to. Create new servlet where test api can be async loaded from