Fix tests I broke when I added validation query