Added missing constructor.
Added missing include.
Unit tests for content handlers.