conditionizr works now. added some extra tests