More tests and fixed that cond="" bug