Alias from SubQuery vs Column.Field and better expects on test unit

Fixes #1640