added back integer expressions and added expression tests