windows and common table expression containers changed from dict to list
moved spacing from operator names into templates
expression tests