CLN: clean up testing and expr