Expand as-expression test coverage, part 1