Test using a dict rather that separate tuples
Test scalar expressions against boolean ops