Remove expect() calls; update nested property structures
Merge pull request #58 from notmessenger/UpdateTests

Remove expect() calls; update nested property structures