Add expression tests and remove unnecessary ones.