Replace pipeline CtorHandler with CtorResolver

Refine unit tests