Added more cond tests