Add more tests, spin before inflating monitors am: eedca4a5f7

Change-Id: I9f4cdc25da8569f05f83c4e768506c60e482e3b2