More Expression and QueryWrapper tests