add support for custom CT and update test