Add new conditional tests