More improvements for wellbeing tests

Change-Id: I3c5866660bfb96378cdc80c1afc70ec438fc9add
2 files changed