Bigger test battery, fixed some bugs for slow merge.