More QueryWrapper tests; placeholder for Expression added