Fix a lot of test cases.
Fix a lot of test cases.

cekdahl/expreduce,corywalker/cas,corywalker/expreduce,corywalker/cas,corywalker/cas,corywalker/expreduce,cekdahl/expreduce,corywalker/expreduce,cekdahl/expreduce