HandlerContainer exported to its own class, Unit tests added