Remove expect() calls; update nested property structures