minor tweaks to testing suite and expr