chg: tests changed (newstruct stuff)
fix: newstruct, '.', etc.

from master