more expression tests mostly
merge