Resolve some code analysis suggestions
Inject handler into controllers, setup method for webload testing