Fix tests effected by r194221

GEP expressions were folded differently from before, change the tests to
reflect this.