Subject: combine tests

* combined the object update tests and added some assertions

Change-Id: I405b857e88b1b77fc4158322c6da467d329a79d8
Merge "Subject: combine tests"