Fix tests, fix .else expansion with [tab]