Fixed two smoke tests

Removed the entity assertion from watch events as the api polls
event every 2 seconds & it doesnt guarantee that we will have
some live events flowing through every 2 seconds. Hence, just
asserting that the api is working fine.
For the second one, added the more appropriate error check.

Change-Id: I38fabd2113ceafc6952ab02386a78503d3d62122