Fix regex to accept multi-variable terms in any order
More expression tests